diff --git a/lib/setup.php b/lib/setup.php
index 9f31b47c0e5..afe56126277 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -275,12 +275,12 @@ class OC_Setup {
 	private static function createHtaccess() {
 		$SERVERROOT=OC::$SERVERROOT;
 		$WEBROOT=OC::$WEBROOT;
-		$content = "ErrorDocument 404 /$WEBROOT/core/templates/404.php\n";//custom 404 error page
-		$content.= '<IfModule mod_php5.c>';
-		$content.= 'php_value upload_max_filesize 512M';//upload limit
-		$content.= 'php_value post_max_size 512M';
-		$content.= 'SetEnv htaccessWorking true';
-		$content.= '</IfModule>';
+		$content = "ErrorDocument 404 $WEBROOT/core/templates/404.php\n";//custom 404 error page
+		$content.= "<IfModule mod_php5.c>\n";
+		$content.= "php_value upload_max_filesize 512M\n";//upload limit
+		$content.= "php_value post_max_size 512M\n";
+		$content.= "SetEnv htaccessWorking true\n";
+		$content.= "</IfModule>\n";
 		$content.= "Options -Indexes\n";
 		@file_put_contents($SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it