diff --git a/lib/setup.php b/lib/setup.php
index 59e4bf0dee2b553af59e701ae47b10cb1c4d719e..5d5609310524fca47beded38edccfafb4e210f8d 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -307,7 +307,7 @@ class OC_Setup {
 	 */
 	private static function createHtaccess() {
 		$content = "ErrorDocument 403 ".OC::$WEBROOT."/core/templates/403.php\n";//custom 403 error page
-		$content = "ErrorDocument 404 ".OC::$WEBROOT."/core/templates/404.php\n";//custom 404 error page
+		$content.= "ErrorDocument 404 ".OC::$WEBROOT."/core/templates/404.php\n";//custom 404 error page
 		$content.= "<IfModule mod_php5.c>\n";
 		$content.= "php_value upload_max_filesize 512M\n";//upload limit
 		$content.= "php_value post_max_size 512M\n";
@@ -318,7 +318,12 @@ class OC_Setup {
 		$content.= "</IfModule>\n";
 		$content.= "<IfModule mod_rewrite.c>\n";
 		$content.= "RewriteEngine on\n";
-		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n";
+ 		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n";
+		$content.= "RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]\n";
+		$content.= "RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]\n";
+		$content.= "RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]\n";
+		$content.= "RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]\n"
+		$content.= "RewriteRule ^remote/(.*) remote.php [QSA,L]\n";
 		$content.= "RewriteRule ^.well-known/carddav /apps/contacts/carddav.php [R]\n";
 		$content.= "RewriteRule ^.well-known/caldav /apps/calendar/caldav.php [R]\n";
 		$content.= "</IfModule>\n";