diff --git a/docker/homeserver.yaml b/docker/homeserver.yaml
index 41ec4cb..9f69b50 100644
--- a/docker/homeserver.yaml
+++ b/docker/homeserver.yaml
@@ -1,7 +1,9 @@
 server_name: "{{SERVER_NAME}}"
+public_baseurl: "https://{{SERVER_NAME}}"
 pid_file: /data/homeserver.pid
+serve_server_wellknown: true
 
-## Federation ## 
+## Federation ##
 # federation_domain_whitelist:
 #   - matrix.papers.tech
 #   - beacon.tztip.me
diff --git a/readme.md b/readme.md
index 357d040..c8b8f01 100644
--- a/readme.md
+++ b/readme.md
@@ -104,6 +104,13 @@ server {
         client_max_body_size 50M;
     }
 
+    # Federation discovery: tells remote servers to use port 443 instead of 8448.
+    # Required when behind Cloudflare or any CDN that blocks port 8448.
+    location /.well-known/matrix/server {
+        return 200 '{"m.server": "MY_SERVER_DOMAIN:443"}';
+        add_header Content-Type application/json;
+    }
+
     location / {
         proxy_set_header   X-Forwarded-For $remote_addr;
         proxy_set_header   Host $http_host;