diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 1ab417c0..96a0458d 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -103,8 +103,13 @@ http {
         auth_request /internal/auth/basic;
         auth_request_set $user $upstream_http_x_user;
         proxy_set_header X-Remote-User $user;
+        proxy_set_header X-Script-Name /webdav;
         proxy_pass http://$webdav;
       }
+
+      location ~ ^/.well-known/(carddav|caldav) {
+        return 301 /webdav/;
+      }
       {% endif %}
       {% endif %}