diff --git a/lib/files.php b/lib/files.php
index fca311833b..0e7e44ec2a 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -297,6 +297,7 @@ class OC_FILES {
 		$content.= "php_value upload_max_filesize $size\n";//upload limit
 		$content.= "php_value post_max_size $size\n";
 		$content.= "SetEnv htaccessWorking true\n";
+		$content.= "Options -Indexes\n";
 		@file_put_contents($SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it
 	}
 }
diff --git a/lib/setup.php b/lib/setup.php
index 0a8c9650cb..a3cefad62b 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -188,6 +188,7 @@ class OC_SETUP {
 		$content.= "php_value upload_max_filesize 20M\n";//upload limit
 		$content.= "php_value post_max_size 20M\n";
 		$content.= "SetEnv htaccessWorking true\n";
+		$content.= "Options -Indexes\n";
 		@file_put_contents($SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it
 
 		$content = "deny from all";