diff --git a/changelogs/client_server/newsfragments/1933.deprecation b/changelogs/client_server/newsfragments/1933.deprecation
new file mode 100644
index 00000000..745a23ab
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1933.deprecation
@@ -0,0 +1 @@
+Deprecate the `server_name` query parameter on `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}` as per MSC4156.
diff --git a/changelogs/client_server/newsfragments/1933.feature b/changelogs/client_server/newsfragments/1933.feature
new file mode 100644
index 00000000..27a29a3e
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1933.feature
@@ -0,0 +1 @@
+Add `via` query parameter on `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}` as per MSC4156.