diff --git a/_config.yml b/_config.yml
index a7f383d..791707a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -26,7 +26,7 @@ sitemap:
     file: "/sitemap.xml"
 # Technically this should be keep_files, but it makes at least .well-known
 # disappear?
-include: [PGP, PHP, keybase.txt, robots.txt, .well-known, ipfs-files]
+include: [PGP, PHP, keybase.txt, robots.txt, .well-known, ipfs-files, _matrix]
 
 # Latest Matrix room version for blog posts or /upgraderoom advice. If I
 # need something from the latest version, this is it once the servers I care
diff --git a/_matrix/federation/v1/query/README.txt b/_matrix/federation/v1/query/README.txt
new file mode 100644
index 0000000..d32a8fe
--- /dev/null
+++ b/_matrix/federation/v1/query/README.txt
@@ -0,0 +1 @@
+Technically Matrix clients look up for .../directory?room_alias=#room:example.net so this directory/file should point all aminda.eu domains to my Space
diff --git a/_matrix/federation/v1/query/directory b/_matrix/federation/v1/query/directory
new file mode 100644
index 0000000..764df83
--- /dev/null
+++ b/_matrix/federation/v1/query/directory
@@ -0,0 +1,10 @@
+{
+  "room_id": "!fGtopoZuCySnTsSdsU:matrix.org",
+  "servers": [
+    "pikaviestin.fi",
+    "matrix.org",
+    "dendrite.matrix.org",
+    "jae.fi",
+    "the-apothecary.club"
+  ]
+}