diff --git a/roles/nginx/templates/sites-enabled/mail.conf b/roles/nginx/templates/sites-enabled/mail.conf
index e7bc61e..3705e1b 100644
--- a/roles/nginx/templates/sites-enabled/mail.conf
+++ b/roles/nginx/templates/sites-enabled/mail.conf
@@ -12,6 +12,21 @@ server {
     }
 }
 
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name autoconfig.{{ domain }};
+
+    location / {
+        return 404;
+    }
+
+    location = /mail/config-v1.1.xml {
+        proxy_pass https://127.0.0.1:{{ ports['mailserver_https'] }};
+    }
+}
+
 server {
     listen 443 ssl;
     listen [::]:443 ssl;