diff --git a/.htaccess b/.htaccess
index 962e969d59..78e6255c87 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,7 +13,7 @@ php_value post_max_size 513M
 php_value memory_limit 512M
 php_value mbstring.func_overload 0
 php_value always_populate_raw_post_data -1
-<IfModule env_module>
+<IfModule mod_env.c>
   SetEnv htaccessWorking true
 </IfModule>
 </IfModule>
@@ -34,7 +34,7 @@ RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
 AddType image/svg+xml svg svgz
 AddEncoding gzip svgz
 </IfModule>
-<IfModule dir_module>
+<IfModule mod_dir.c>
 DirectoryIndex index.php index.html
 </IfModule>
 AddDefaultCharset utf-8
diff --git a/config/.htaccess b/config/.htaccess
index 2421e9a163..c7a7b79fea 100644
--- a/config/.htaccess
+++ b/config/.htaccess
@@ -1,10 +1,10 @@
 # line below if for Apache 2.4
-<ifModule mod_authz_core>
+<ifModule mod_authz_core.c>
 Require all denied
 </ifModule>
 
 # line below if for Apache 2.2
-<ifModule !mod_authz_core>
+<ifModule !mod_authz_core.c>
 deny from all
 </ifModule>
 
diff --git a/lib/private/setup.php b/lib/private/setup.php
index a350838763..e3a29b6469 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -287,11 +287,11 @@ class OC_Setup {
 		$now =  date('Y-m-d H:i:s');
 		$content = "# Generated by ownCloud on $now\n";
 		$content.= "# line below if for Apache 2.4\n";
-		$content.= "<ifModule mod_authz_core>\n";
+		$content.= "<ifModule mod_authz_core.c>\n";
 		$content.= "Require all denied\n";
 		$content.= "</ifModule>\n\n";
 		$content.= "# line below if for Apache 2.2\n";
-		$content.= "<ifModule !mod_authz_core>\n";
+		$content.= "<ifModule !mod_authz_core.c>\n";
 		$content.= "deny from all\n";
 		$content.= "</ifModule>\n\n";
 		$content.= "# section for Apache 2.2 and 2.4\n";