diff --git a/.well-known/matrix/client b/.well-known/matrix/client
new file mode 100644
index 0000000..277e2c3
--- /dev/null
+++ b/.well-known/matrix/client
@@ -0,0 +1 @@
+{"m.homeserver": {"base_url": "https://matrix.hswro.org"}}
diff --git a/.well-known/matrix/server b/.well-known/matrix/server
new file mode 100644
index 0000000..3db1a25
--- /dev/null
+++ b/.well-known/matrix/server
@@ -0,0 +1 @@
+{"m.server": "matrix.hswro.org:443"}
diff --git a/_config.yml b/_config.yml
index 079085f..d1c8fb8 100755
--- a/_config.yml
+++ b/_config.yml
@@ -20,6 +20,9 @@ favicon: "images/favicon.svg"
 sass:
   style: compressed # possible values: nested expanded compact compressed
 
+include:
+  - .well-known
+
 exclude:
   - Gemfile
   - Gemfile.lock
diff --git a/docker/serve_base.Dockerfile b/docker/serve_base.Dockerfile
index b1977d5..ea1c2a3 100644
--- a/docker/serve_base.Dockerfile
+++ b/docker/serve_base.Dockerfile
@@ -2,6 +2,8 @@ FROM caddy:2.9
 
 RUN echo -e ":3000 {\n\
     root * /var/www\n\
+    header /.well-known* Content-Type application/json\n\
+    header /.well-known/matrix/client Access-Control-Allow-Origin *\n\
     file_server\n\
 }" > /etc/caddy/Caddyfile
 WORKDIR /var/www