diff --git a/changelogs/client_server/newsfragments/1858.deprecation b/changelogs/client_server/newsfragments/1858.deprecation
new file mode 100644
index 000000000..6e93dca58
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1858.deprecation
@@ -0,0 +1 @@
+Use of the `/_matrix/media/*` endpoints is now deprecated. New, authenticated, endpoints are available instead.
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1858.feature.1 b/changelogs/client_server/newsfragments/1858.feature.1
new file mode 100644
index 000000000..02b9b51ed
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1858.feature.1
@@ -0,0 +1 @@
+Media downloads and thumbnails are now authenticated, as per [MSC3916](https://github.com/matrix-org/matrix-spec-proposals/pull/3916).
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1858.feature.2 b/changelogs/client_server/newsfragments/1858.feature.2
new file mode 100644
index 000000000..63dfbb787
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1858.feature.2
@@ -0,0 +1 @@
+Some media endpoints are now consistently under `/_matrix/client/{version}/media/*` instead of `/_matrix/media/*`, as per [MSC3916](https://github.com/matrix-org/matrix-spec-proposals/pull/3916).
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1858.new.1 b/changelogs/client_server/newsfragments/1858.new.1
new file mode 100644
index 000000000..9d02447f7
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1858.new.1
@@ -0,0 +1 @@
+[`GET /_matrix/client/v1/media/config`](/client-server-api/#get_matrixclientv1mediaconfig)
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1858.new.2 b/changelogs/client_server/newsfragments/1858.new.2
new file mode 100644
index 000000000..07e7763ae
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1858.new.2
@@ -0,0 +1 @@
+[`GET /_matrix/client/v1/media/download/{serverName}/{mediaId}`](/client-server-api/#get_matrixclientv1mediadownloadservernamemediaid)
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1858.new.3 b/changelogs/client_server/newsfragments/1858.new.3
new file mode 100644
index 000000000..49b67f049
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1858.new.3
@@ -0,0 +1 @@
+[`GET /_matrix/client/v1/media/download/{serverName}/{mediaId}/{fileName}`](/client-server-api/#get_matrixclientv1mediadownloadservernamemediaidfilename)
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1858.new.4 b/changelogs/client_server/newsfragments/1858.new.4
new file mode 100644
index 000000000..dda53b330
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1858.new.4
@@ -0,0 +1 @@
+[`GET /_matrix/client/v1/media/preview_url`](/client-server-api/#get_matrixclientv1mediapreview_url)
\ No newline at end of file
diff --git a/changelogs/client_server/newsfragments/1858.new.5 b/changelogs/client_server/newsfragments/1858.new.5
new file mode 100644
index 000000000..021b4023d
--- /dev/null
+++ b/changelogs/client_server/newsfragments/1858.new.5
@@ -0,0 +1 @@
+[`GET /_matrix/client/v1/media/thumbnail/{serverName}/{mediaId}`](/client-server-api/#get_matrixclientv1mediathumbnailservernamemediaid)
\ No newline at end of file
diff --git a/changelogs/server_server/newsfragments/1858.deprecation b/changelogs/server_server/newsfragments/1858.deprecation
new file mode 100644
index 000000000..fd3d25765
--- /dev/null
+++ b/changelogs/server_server/newsfragments/1858.deprecation
@@ -0,0 +1 @@
+Use of the Client-Server API `/_matrix/media/*` endpoints is now deprecated. New, authenticated, endpoints are available instead.
\ No newline at end of file
diff --git a/changelogs/server_server/newsfragments/1858.feature b/changelogs/server_server/newsfragments/1858.feature
new file mode 100644
index 000000000..02b9b51ed
--- /dev/null
+++ b/changelogs/server_server/newsfragments/1858.feature
@@ -0,0 +1 @@
+Media downloads and thumbnails are now authenticated, as per [MSC3916](https://github.com/matrix-org/matrix-spec-proposals/pull/3916).
\ No newline at end of file
diff --git a/changelogs/server_server/newsfragments/1858.new.1 b/changelogs/server_server/newsfragments/1858.new.1
new file mode 100644
index 000000000..e50d5fd18
--- /dev/null
+++ b/changelogs/server_server/newsfragments/1858.new.1
@@ -0,0 +1 @@
+[`GET /_matrix/federation/v1/media/download/{mediaId}`](/server-server-api/#get_matrixfederationv1mediadownloadmediaid)
\ No newline at end of file
diff --git a/changelogs/server_server/newsfragments/1858.new.2 b/changelogs/server_server/newsfragments/1858.new.2
new file mode 100644
index 000000000..1da2a693f
--- /dev/null
+++ b/changelogs/server_server/newsfragments/1858.new.2
@@ -0,0 +1 @@
+[`GET /_matrix/federation/v1/media/thumbnail/{mediaId}`](/server-server-api/#get_matrixfederationv1mediathumbnailmediaid)
\ No newline at end of file