diff --git a/ecrire/inc_version.php3 b/ecrire/inc_version.php3
index 12659cb7b07afc3a9c61a2e4cf627305088d02f2..31b8ba3bf7a90c5b2ebb9779ae4515d96f48d5cf 100644
--- a/ecrire/inc_version.php3
+++ b/ecrire/inc_version.php3
@@ -227,14 +227,12 @@ feed_post_files('HTTP_POST_FILES');
 //
 // Appliquer le prefixe cookie
 //
-function spip_setcookie ($name='', $value='', $expire='', $path='', $domain='', $secure='') {
+function spip_setcookie ($name='', $value='', $expire=0, $path='', $domain='', $secure='') {
 	$name = ereg_replace ('^spip', $GLOBALS['cookie_prefix'], $name);
 	
-	// patch safari beta 51
-    if (!$path AND eregi("Safari", $GLOBALS['HTTP_USER_AGENT'])) {  
-        $path = "/";
-        $expire = time()+36000;
-    }
+	// patch safari beta 51-60
+    if (!$path AND eregi("Safari", $GLOBALS['HTTP_USER_AGENT']))
+        $path = ereg_replace("/[^/]+", "/", $GLOBALS['REQUEST_URI']);
 
 	if ($secure)
 		@setcookie ($name, $value, $expire, $path, $domain, $secure);