diff --git a/build/.htaccess b/build/.htaccess
index c7a7b79feac0..853aed187d3e 100644
--- a/build/.htaccess
+++ b/build/.htaccess
@@ -9,4 +9,6 @@ deny from all
 </ifModule>
 
 # section for Apache 2.2 and 2.4
+<ifModule mod_autoindex.c>
 IndexIgnore *
+</ifModule>
diff --git a/config/.htaccess b/config/.htaccess
index c7a7b79feac0..853aed187d3e 100644
--- a/config/.htaccess
+++ b/config/.htaccess
@@ -9,4 +9,6 @@ deny from all
 </ifModule>
 
 # section for Apache 2.2 and 2.4
+<ifModule mod_autoindex.c>
 IndexIgnore *
+</ifModule>
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index d53f9f004c57..3abbb3d8cfe1 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -473,7 +473,9 @@ public static function protectDataDirectory() {
 		$content.= "Satisfy All\n";
 		$content.= "</ifModule>\n\n";
 		$content.= "# section for Apache 2.2 and 2.4\n";
+		$content.= "<ifModule mod_autoindex.c>\n";
 		$content.= "IndexIgnore *\n";
+		$content.= "</ifModule>\n";
 
 		$baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
 		file_put_contents($baseDir . '/.htaccess', $content);