diff --git a/lib/helper.php b/lib/helper.php
index 82d1017debdd944592c003eb1925b8e336d95c38..2ddd5e7b7787dd5cbe78fb12212863a961652802 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -341,8 +341,8 @@ class OC_Helper {
 		if (!$isWrapped and $mimeType=='application/octet-stream' && OC_Helper::canExecute("file")) {
 			// it looks like we have a 'file' command,
 			// lets see it it does have mime support
-			$path=str_replace("'","\'",$path);
-			$fp = popen("file -i -b '$path' 2>/dev/null", "r");
+			$path=escapeshellarg($path);
+			$fp = popen("file -i -b $path 2>/dev/null", "r");
 			$reply = fgets($fp);
 			pclose($fp);