diff --git a/.htaccess b/.htaccess
index b181f8b8452..86a2de6b946 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,6 +5,8 @@ php_value post_max_size 512M
 php_value memory_limit 512M
 SetEnv htaccessWorking true
 </IfModule>
+<IfModule mod_rewrite.c>
 RewriteEngine on
 RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]
+</IfModule>
 Options -Indexes
diff --git a/lib/setup.php b/lib/setup.php
index 8afe0070e9b..b53c626c9a7 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -275,7 +275,7 @@ class OC_Setup {
 		$content.= "php_value post_max_size 512M\n";
 		$content.= "SetEnv htaccessWorking true\n";
 		$content.= "</IfModule>\n";
-		$content.= "<IfModule !mod_php5.c>\n";
+		$content.= "<IfModule mod_rewrite.c>";
 		$content.= "RewriteEngine on\n";
 		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n";
 		$content.= "</IfModule>\n";