--- ../ezpublish-3.10.0/lib/ezutils/classes/ezsys.php   2007-10-03 16:05:45.000000000 +0200
+++ lib/ezutils/classes/ezsys.php       2007-12-04 12:41:13.000000000 +0100
@@ -273,8 +273,17 @@
         else
             $instance =& eZSys::instance();
         $escapeChar = $instance->ShellEscapeCharacter;
-        $argument = str_replace( "\\", "\\\\", $argument );
-        $argument = str_replace( $escapeChar, "\\" . $escapeChar, $argument );
+
+        if ( $instance->OSType == 'unix' && $escapeChar == "'" )
+        {
+            $argument = str_replace( "'", "'\\''", $argument );
+        }
+        else
+        {
+            $argument = str_replace( $escapeChar, "\\" . $escapeChar, $argument );
+            $argument = str_replace( "\\", "\\\\", $argument );
+        }
+
         $argument = $escapeChar . $argument . $escapeChar;
         return $argument;
     }