diff --git a/changelogs/client_server/newsfragments/2536.feature b/changelogs/client_server/newsfragments/2536.feature
new file mode 100644
index 00000000..57c9359b
--- /dev/null
+++ b/changelogs/client_server/newsfragments/2536.feature
@@ -0,0 +1 @@
+Add cross-signing properties to the response of ``POST /keys/query``
diff --git a/changelogs/client_server/newsfragments/2536.new b/changelogs/client_server/newsfragments/2536.new
new file mode 100644
index 00000000..57d45ab6
--- /dev/null
+++ b/changelogs/client_server/newsfragments/2536.new
@@ -0,0 +1 @@
+``POST /keys/device_signing/upload`` and ``POST /keys/signatures/upload``
diff --git a/changelogs/server_server/newsfragments/2536.feature b/changelogs/server_server/newsfragments/2536.feature
new file mode 100644
index 00000000..3668672b
--- /dev/null
+++ b/changelogs/server_server/newsfragments/2536.feature
@@ -0,0 +1,7 @@
+Add cross-signing:
+
+- Add properties to the response of ``GET /user/keys`` and ``GET
+  /user/devices/{userId}``.
+- The ``m.device_list_update`` EDU is sent when a device gets a new signature.
+- A new ``m.signing_key_update`` EDU is sent when a user's cross-signing keys
+  are changed.