diff --git a/.htaccess b/.htaccess
index 463b49993e6062ebdb2bb805944bdf6280a09951..201e0d605b72dc893a5680df1f89328a31912386 100755
--- a/.htaccess
+++ b/.htaccess
@@ -32,5 +32,8 @@ RewriteRule ^remote/(.*) remote.php [QSA,L]
 AddType image/svg+xml svg svgz
 AddEncoding gzip svgz
 </IfModule>
+<IfModule dir_module>
+DirectoryIndex index.php index.html
+</IfModule>
 AddDefaultCharset utf-8
 Options -Indexes
diff --git a/index.html b/index.html
index 69d42e3a0b37a0368482f8a776804faba34c4d36..f160f46b6fc2bf9a7c1351dde07695afb1e249f2 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+	<script type="text/javascript"> window.location.href="index.php"; </script>
 	<meta http-equiv="refresh" content="0; URL=index.php">
 </head>
 </html>
diff --git a/lib/setup.php b/lib/setup.php
index c330729298e1891286f29dc6263acd64e287ce20..d1197b3ebf3bf0a47808cfda9147793f42802417 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.= "</IfModule>\n";
+		$content.= "<IfModule dir_module>\n";
+		$content.= "DirectoryIndex index.php index.html\n";
+		$content.= "</IfModule>\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