diff --git a/.well-known/matrix/client b/.well-known/matrix/client
new file mode 100644
index 0000000000..43651c5d2c
--- /dev/null
+++ b/.well-known/matrix/client
@@ -0,0 +1,8 @@
+{
+  "m.homeserver": {
+    "base_url": "https://matrix.fsfe.org"
+  },
+  "m.identity_server": {
+    "base_url": "https://vector.im"
+  }
+}
diff --git a/.well-known/matrix/server b/.well-known/matrix/server
new file mode 100644
index 0000000000..b620285b86
--- /dev/null
+++ b/.well-known/matrix/server
@@ -0,0 +1,3 @@
+{
+    "m.server": "matrix.fsfe.org:443"
+}