diff --git a/changelog.d/6095.bugfix b/changelog.d/6095.bugfix
new file mode 100644
index 0000000000..11110bfa08
--- /dev/null
+++ b/changelog.d/6095.bugfix
@@ -0,0 +1 @@
+Correct .well-known/matrix/client handling for server_names which include ports.