diff --git a/config/apache-davical.conf b/config/apache-davical.conf
index d9a898ce..9aaa95a7 100644
--- a/config/apache-davical.conf
+++ b/config/apache-davical.conf
@@ -3,18 +3,45 @@
 Alias /davical /usr/share/davical/htdocs
 
 <Directory /usr/share/davical/htdocs>
-  DirectoryIndex index.php index.html
+  DirectoryIndex index.php
   AllowOverride None
   # for Apache from 2.4 use
   Require all granted
   # for Apache before 2.4 use
   #Order allow,deny
   #Allow from all
-  AcceptPathInfo On
-  php_value include_path /usr/share/php/awl/inc
-  php_value magic_quotes_gpc 0
-  php_value register_globals 0
-  php_value error_reporting "E_ALL & ~E_NOTICE"
-  php_value default_charset "utf-8" 
+
+  # These are usually not necessary (set correctly by default)
+  #AcceptPathInfo On
+  #php_value include_path /usr/share/php/awl/inc
+  #php_value magic_quotes_gpc 0
+  #php_value register_globals 0
+  #php_value error_reporting "E_ALL & ~E_NOTICE"
+  #php_value default_charset "utf-8"
+
+  # Some people want this. YMMV.
+  #php_admin_value open_basedir /usr/share/awl/inc/:/usr/share/davical/:/etc/davical/
 </Directory>
 
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+
+  # Redirect /.well-known URLs
+  RewriteRule ^/\.well-known/(.*)$ /davical/caldav.php/.well-known/$1 [NC,L]
+  # Optionally: redirect /principals/users/ as well
+  RewriteRule ^/principals/users/(.*)$ /davical/caldav.php/$1 [NC,L]
+
+  # Optionally: Put DAViCal in the root
+  # NOTE: this will break other applications that rely on mod_rewrite!
+  #
+  # Not if it's the root URL.  You might want to comment this out if you
+  # want to use an explicit /index.php for getting to the admin pages.
+  #RewriteCond %{REQUEST_URI} !^/$
+  #RewriteCond %{REQUEST_URI} !^/davical/$
+  #
+  # Not if it explicitly specifies a .php program, html page, stylesheet or image
+  #RewriteCond %{REQUEST_URI} !\.(php|html|css|js|png|gif|jpg|ico)
+  #
+  # Everything else gets rewritten to /caldav.php/...
+  #RewriteRule ^(.*)$ /caldav.php$1  [NC,L]
+</IfModule>
diff --git a/htdocs/.htaccess b/htdocs/.htaccess
index a9bffef9..7e560f6c 100644
--- a/htdocs/.htaccess
+++ b/htdocs/.htaccess
@@ -18,8 +18,8 @@
 # RewriteCond %{REQUEST_URI} !^/$
 # RewriteCond %{REQUEST_URI} !^/davical/$
 
-# # Not if it explicitly specifies a .php program, stylesheet or image
-# RewriteCond %{REQUEST_URI} !\.(php|css|js|png|gif|jpg)
+# # Not if it explicitly specifies a .php program, html page, stylesheet or image
+# RewriteCond %{REQUEST_URI} !\.(php|html|css|js|png|gif|jpg|ico)
 
 # # Everything else gets rewritten to /caldav.php/...
 # RewriteRule ^(.*)$ /caldav.php$1  [NC,L]