diff --git a/config/hosts/public-web-static/virtualHosts/hamburg.ccc.de.nix b/config/hosts/public-web-static/virtualHosts/hamburg.ccc.de.nix
index bb78b63..aac7fa2 100644
--- a/config/hosts/public-web-static/virtualHosts/hamburg.ccc.de.nix
+++ b/config/hosts/public-web-static/virtualHosts/hamburg.ccc.de.nix
@@ -34,6 +34,19 @@
         return = "302 https://spaceapi.hamburg.ccc.de/";
       };
 
+    locations."/.well-known/matrix/server" = {
+      return = "200 '{\"m.server\": \"matrix.hamburg.ccc.de:443\"}'";
+      extraConfig = ''
+        add_header Content-Type application/json;
+      '';
+    };
+    locations."/.well-known/matrix/client" = {
+      return = "200 '{\"m.homeserver\": {\"base_url\": \"https://matrix.hamburg.ccc.de\"}, \"m.identity_server\": {\"base_url\": \"https://vector.im\"}}'";
+      extraConfig = ''
+        default_type application/json;
+        add_header Access-Control-Allow-Origin *;
+      '';
+    };
       # Redirect pages starting with 4 digits for redirecting the old blog
       # article URLs.
       # We want to redirect /yyyy/mm/dd/slug to /blog/yyyy/mm/dd/slug, but we