diff --git a/server/Caddyfile b/server/Caddyfile
index 204967a..4b40917 100644
--- a/server/Caddyfile
+++ b/server/Caddyfile
@@ -5,6 +5,10 @@
 
 <DOMAIN>, *.<DOMAIN> {
     uri path_regexp ^/static/ /public/
+    handle /.well-known/matrix/server {
+        respond "{\"m.server\": \"matrix.handmade.network:443\"}"
+        header Content-Type application/json
+    }
     handle /public/* {
         file_server {
             root /home/hmn/hmn
diff --git a/server/root.Makefile b/server/root.Makefile
index 7f5821a..b2a68f2 100644
--- a/server/root.Makefile
+++ b/server/root.Makefile
@@ -24,6 +24,14 @@ edit-config: ## Edit the website config
 	@echo '    make deploy'
 	@echo ''
 
+edit-caddyfile: ## Edit the Caddyfile
+	vim /home/caddy/Caddyfile
+	@echo 'Now that you have edited the Caddyfile, you probably want to restart Caddy:'
+	@echo ''
+	@echo '    systemctl restart caddy'
+	@echo ''
+	@echo "Don't forget to copy your changes back to the repo when you're done."
+
 logs: ## View logs for the website
 	journalctl -u hmn.service -n 100 -f