diff --git a/.htaccess b/.htaccess
index 463b49993e..201e0d605b 100755
--- a/.htaccess
+++ b/.htaccess
@@ -32,5 +32,8 @@ RewriteRule ^remote/(.*) remote.php [QSA,L]
AddType image/svg+xml svg svgz
AddEncoding gzip svgz
+
+DirectoryIndex index.php index.html
+
AddDefaultCharset utf-8
Options -Indexes
diff --git a/index.html b/index.html
index 69d42e3a0b..f160f46b6f 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,7 @@
+
diff --git a/lib/setup.php b/lib/setup.php
index c330729298..d1197b3ebf 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -828,6 +828,10 @@ class OC_Setup {
$content.= "AddType image/svg+xml svg svgz\n";
$content.= "AddEncoding gzip svgz\n";
$content.= "\n";
+ $content.= "\n";
+ $content.= "DirectoryIndex index.php index.html\n";
+ $content.= "\n";
+ $content.= "AddDefaultCharset utf-8\n";
$content.= "Options -Indexes\n";
@file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it