diff --git a/.htaccess b/.htaccess
index 048a56d638..8883936e0c 100755
--- a/.htaccess
+++ b/.htaccess
@@ -6,11 +6,11 @@ RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
 </IfModule>
 </IfModule>
 </IfModule>
-ErrorDocument 403 /core/templates/403.php
-ErrorDocument 404 /core/templates/404.php
+ErrorDocument 403 /owncloud/core/templates/403.php
+ErrorDocument 404 /owncloud/core/templates/404.php
 <IfModule mod_php5.c>
-php_value upload_max_filesize 513M
-php_value post_max_size 513M
+php_value upload_max_filesize 512M
+php_value post_max_size 512M
 php_value memory_limit 512M
 <IfModule env_module>
   SetEnv htaccessWorking true
@@ -20,11 +20,8 @@ php_value memory_limit 512M
 RewriteEngine on
 RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]
-RewriteRule ^.well-known/host-meta.json /public.php?service=host-meta-json [QSA,L]
 RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]
-RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]	
-RewriteRule ^apps/calendar/caldav.php remote.php/caldav/ [QSA,L]
-RewriteRule ^apps/contacts/carddav.php remote.php/carddav/ [QSA,L]
+RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]
 RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
 RewriteRule ^remote/(.*) remote.php [QSA,L]
 </IfModule>