diff --git a/htdocs/caldav.php b/htdocs/caldav.php
index 2083fb6f..8b0d9334 100644
--- a/htdocs/caldav.php
+++ b/htdocs/caldav.php
@@ -19,11 +19,16 @@ if ( isset($_SERVER['PATH_INFO']) && preg_match( '{^(/favicon.ico|davical.css|(i
   }
   exit(0);
 }
-elseif ( isset($_SERVER['PATH_INFO']) && preg_match( '{^/\.well-known/(.+)$}', $_SERVER['PATH_INFO'], $matches ) ) {
-	require ('well-known.php');
+require_once('./always.php');
+
+if ( isset($_SERVER['PATH_INFO']) && preg_match( '{^/\.well-known/(.+)$}', $_SERVER['PATH_INFO'], $matches ) ) {
+  require ('well-known.php');
+  exit(0);
+}
+elseif ( isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'] == '/autodiscover/autodiscover.xml' ) {
+  require ('autodiscover-handler.php');
   exit(0);
 }
-require_once('./always.php');
 
 function logRequestHeaders() {
   global $c;
diff --git a/inc/autodiscover-handler.php b/inc/autodiscover-handler.php
new file mode 100644
index 00000000..9eda2e6c
--- /dev/null
+++ b/inc/autodiscover-handler.php
@@ -0,0 +1,2 @@
+<?php
+echo "autodiscover is not handled yet."
\ No newline at end of file
diff --git a/htdocs/well-known.php b/inc/well-known.php
similarity index 99%
rename from htdocs/well-known.php
rename to inc/well-known.php
index 64192d8e..6e50b1b3 100644
--- a/htdocs/well-known.php
+++ b/inc/well-known.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once('./always.php');
-
 dbg_error_log( 'well-known', 'iSchedule requested' );
 
 require_once('HTTPAuthSession.php');