diff --git a/examples/apache/matrix-synapse.conf b/examples/apache/matrix-synapse.conf
index 4f32c2ed9..7ed712ab6 100644
--- a/examples/apache/matrix-synapse.conf
+++ b/examples/apache/matrix-synapse.conf
@@ -34,6 +34,7 @@
 
 	# Keep some URIs free for different proxy/location
 	ProxyPassMatch ^/.well-known/matrix/client !
+	ProxyPassMatch ^/.well-known/matrix/server !
 	ProxyPassMatch ^/_matrix/identity !
 	ProxyPassMatch ^/_matrix/client/r0/user_directory/search !
 
@@ -46,10 +47,18 @@
 	<Files "/matrix/static-files/.well-known/matrix/client">
 		Require all granted
 	</Files>
-	<Location "/.well-known/matrix/client>
+	<Location "/.well-known/matrix/client">
 		Header always set Content-Type "application/json"
 		Header always set Access-Control-Allow-Origin "*"
 	</Location>
+	# Map /.well-known/matrix/server for server discovery
+	Alias /.well-known/matrix/server /matrix/static-files/.well-known/matrix/server
+	<Files "/matrix/static-files/.well-known/matrix/server">
+		Require all granted
+	</Files>
+	<Location "/.well-known/matrix/server">
+		Header always set Content-Type "application/json"
+	</Location>
 	<Directory /matrix/static-files/.well-known/matrix/>
 		AllowOverride All
 		# Apache 2.4: