diff --git a/nginx.conf b/nginx.conf
index 9ef33e3..2a15f5d 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -25,6 +25,20 @@ server {
         add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0" always;
     }
 
+    # Matrix Server Delegation (.well-known)
+    location /.well-known/matrix/server {
+        default_type application/json;
+        add_header Access-Control-Allow-Origin * always;
+        return 200 '{"m.server": "matrix.mischlabs.de:443"}';
+    }
+
+    # Matrix Client Delegation (.well-known)
+    location /.well-known/matrix/client {
+        default_type application/json;
+        add_header Access-Control-Allow-Origin * always;
+        return 200 '{"m.homeserver":{"base_url":"https://matrix.mischlabs.de"},"org.matrix.msc3575.proxy":{"url":"https://matrix.mischlabs.de"}}';
+    }
+
     # Cache static assets
     location ~* \.(css|js|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
         expires 7d;