diff --git a/Makefile b/Makefile
index c95e49b..e1e0b82 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,13 @@ credentials: \
 $(KEY_DIR)/%.asc:
 	$(call fetch_pgp_key,$(basename $(notdir $@)))
 
+$(OUT_DIR)/website/.well-known/matrix/server \
+$(OUT_DIR)/website/.well-known/matrix/server:
+	mkdir -p $(OUT_DIR)/website/.well-known/matrix
+	cp -R \
+		$(SRC_DIR)/well-known/matrix/* \
+		$(OUT_DIR)/website/.well-known/matrix/
+
 $(OUT_DIR)/website/.well-known/openpgpkey:
 	$(call toolchain," \
 		sq wkd \
@@ -39,7 +46,9 @@ $(OUT_DIR)/website/.well-known/openpgpkey:
 	")
 
 $(OUT_DIR)/website/index.html: \
-	$(OUT_DIR)/website/.well-known/openpgpkey
+	$(OUT_DIR)/website/.well-known/openpgpkey \
+	$(OUT_DIR)/website/.well-known/matrix/server \
+	$(OUT_DIR)/website/.well-known/matrix/client
 	$(call toolchain," \
 		cd $(SRC_DIR)/website \
 		&& jekyll build \
diff --git a/src/well-known/matrix/client b/src/well-known/matrix/client
new file mode 100644
index 0000000..f2ee293
--- /dev/null
+++ b/src/well-known/matrix/client
@@ -0,0 +1,8 @@
+{
+    "m.homeserver": {
+        "base_url": "https://distrust.ems.host"
+    },
+    "m.identity_server": {
+        "base_url": "https://vector.im"
+    }
+}
diff --git a/src/well-known/matrix/server b/src/well-known/matrix/server
new file mode 100644
index 0000000..f81721e
--- /dev/null
+++ b/src/well-known/matrix/server
@@ -0,0 +1,3 @@
+{
+    "m.server": "distrust.ems.host:443"
+}