diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index eb92c29d..c56a1073 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -1,3 +1,85 @@
+r0.5.0
+======
+
+Breaking Changes
+----------------
+
+- Add a new ``submit_url`` field to the responses of ``/requestToken`` which older clients will not be able to handle correctly. (`#2101 <https://github.com/matrix-org/matrix-doc/issues/2101>`_)
+
+
+Deprecations
+------------
+
+- Remove references to presence lists. (`#1817 <https://github.com/matrix-org/matrix-doc/issues/1817>`_)
+
+
+New Endpoints
+-------------
+
+- ``GET /account_data`` routes. (`#1873 <https://github.com/matrix-org/matrix-doc/issues/1873>`_)
+
+
+Backwards Compatible Changes
+----------------------------
+
+- Add megolm session export format. (`#1701 <https://github.com/matrix-org/matrix-doc/issues/1701>`_)
+- Add support for advertising experimental features to clients. (`#1786 <https://github.com/matrix-org/matrix-doc/issues/1786>`_)
+- Add a generic SSO login API. (`#1789 <https://github.com/matrix-org/matrix-doc/issues/1789>`_)
+- Add a mechanism for servers to redirect clients to an alternative homeserver after logging in. (`#1790 <https://github.com/matrix-org/matrix-doc/issues/1790>`_)
+- Add room version upgrades. (`#1791 <https://github.com/matrix-org/matrix-doc/issues/1791>`_, `#1875 <https://github.com/matrix-org/matrix-doc/issues/1875>`_)
+- Support optional features by having clients query for capabilities. (`#1829 <https://github.com/matrix-org/matrix-doc/issues/1829>`_, `#1879 <https://github.com/matrix-org/matrix-doc/issues/1879>`_)
+- Add ``M_RESOURCE_LIMIT_EXCEEDED`` as an error code for when homeservers exceed limits imposed on them. (`#1874 <https://github.com/matrix-org/matrix-doc/issues/1874>`_)
+- Emit ``M_UNSUPPORTED_ROOM_VERSION`` error codes where applicable on ``/createRoom`` and ``/invite`` APIs. (`#1908 <https://github.com/matrix-org/matrix-doc/issues/1908>`_)
+- Add a ``.m.rule.tombstone`` default push rule for room ugprade notifications. (`#2020 <https://github.com/matrix-org/matrix-doc/issues/2020>`_)
+- Add support for sending server notices to clients. (`#2026 <https://github.com/matrix-org/matrix-doc/issues/2026>`_)
+- Add MSISDN (phone number) support to User-Interactive Authentication. (`#2030 <https://github.com/matrix-org/matrix-doc/issues/2030>`_)
+- Add the option to lazy-load room members for increased client performance. (`#2035 <https://github.com/matrix-org/matrix-doc/issues/2035>`_)
+- Add ``id_server`` to ``/deactivate`` and ``/3pid/delete`` endpoints to unbind from a specific identity server. (`#2046 <https://github.com/matrix-org/matrix-doc/issues/2046>`_)
+- Add support for Olm sessions becoming un-stuck. (`#2059 <https://github.com/matrix-org/matrix-doc/issues/2059>`_)
+- Add interactive device verification, including a common framework for device verification. (`#2072 <https://github.com/matrix-org/matrix-doc/issues/2072>`_)
+
+
+Spec Clarifications
+-------------------
+
+- Change examples to use example.org instead of a real domain. (`#1650 <https://github.com/matrix-org/matrix-doc/issues/1650>`_)
+- Clarify that ``state_default`` in ``m.room.power_levels`` always defaults to 50. (`#1656 <https://github.com/matrix-org/matrix-doc/issues/1656>`_)
+- Add missing ``status_msg`` to ``m.presence`` schema. (`#1744 <https://github.com/matrix-org/matrix-doc/issues/1744>`_)
+- Fix various spelling mistakes throughout the specification. (`#1838 <https://github.com/matrix-org/matrix-doc/issues/1838>`_, `#1853 <https://github.com/matrix-org/matrix-doc/issues/1853>`_, `#1860 <https://github.com/matrix-org/matrix-doc/issues/1860>`_, `#1933 <https://github.com/matrix-org/matrix-doc/issues/1933>`_, `#1969 <https://github.com/matrix-org/matrix-doc/issues/1969>`_, `#1988 <https://github.com/matrix-org/matrix-doc/issues/1988>`_, `#1989 <https://github.com/matrix-org/matrix-doc/issues/1989>`_, `#1991 <https://github.com/matrix-org/matrix-doc/issues/1991>`_, `#1992 <https://github.com/matrix-org/matrix-doc/issues/1992>`_)
+- Add the missing ``m.push_rules`` event schema. (`#1889 <https://github.com/matrix-org/matrix-doc/issues/1889>`_)
+- Clarify how modern day local echo is meant to be solved by clients. (`#1891 <https://github.com/matrix-org/matrix-doc/issues/1891>`_)
+- Clarify that ``width`` and ``height`` are required parameters on ``/_matrix/media/r0/thumbnail/{serverName}/{mediaId}``. (`#1975 <https://github.com/matrix-org/matrix-doc/issues/1975>`_)
+- Clarify how ``m.login.dummy`` can be used to disambiguate login flows. (`#1999 <https://github.com/matrix-org/matrix-doc/issues/1999>`_)
+- Remove ``prev_content`` from the redaction algorithm's essential keys list. (`#2016 <https://github.com/matrix-org/matrix-doc/issues/2016>`_)
+- Fix the ``third_party_signed`` definitions for the join APIs. (`#2025 <https://github.com/matrix-org/matrix-doc/issues/2025>`_)
+- Clarify why User Interactive Auth is used on password changes and how access tokens are handled. (`#2027 <https://github.com/matrix-org/matrix-doc/issues/2027>`_)
+- Clarify that devices are deleted upon logout. (`#2028 <https://github.com/matrix-org/matrix-doc/issues/2028>`_)
+- Add ``M_NOT_FOUND`` error definition for deleting room aliases. (`#2029 <https://github.com/matrix-org/matrix-doc/issues/2029>`_)
+- Add missing ``reason`` to ``m.call.hangup``. (`#2031 <https://github.com/matrix-org/matrix-doc/issues/2031>`_)
+- Clarify how redactions affect room state. (`#2032 <https://github.com/matrix-org/matrix-doc/issues/2032>`_)
+- Clarify that ``FAIL_ERROR`` in autodiscovery is not limited to just homeservers. (`#2036 <https://github.com/matrix-org/matrix-doc/issues/2036>`_)
+- Fix example ``Content-Type`` for ``/media/upload`` request. (`#2041 <https://github.com/matrix-org/matrix-doc/issues/2041>`_)
+- Clarify that login flows are meant to be completed in order. (`#2042 <https://github.com/matrix-org/matrix-doc/issues/2042>`_)
+- Clarify that clients should not send read receipts for their own messages. (`#2043 <https://github.com/matrix-org/matrix-doc/issues/2043>`_)
+- Use consistent examples of events throughout the specification. (`#2051 <https://github.com/matrix-org/matrix-doc/issues/2051>`_)
+- Clarify which push rule condition kinds exist. (`#2052 <https://github.com/matrix-org/matrix-doc/issues/2052>`_)
+- Clarify the required fields on ``m.file`` (and similar) messages. (`#2053 <https://github.com/matrix-org/matrix-doc/issues/2053>`_)
+- Clarify that User-Interactive Authentication stages cannot be attempted more than once. (`#2054 <https://github.com/matrix-org/matrix-doc/issues/2054>`_)
+- Clarify which parameters apply in what scenarios on ``/register``. (`#2055 <https://github.com/matrix-org/matrix-doc/issues/2055>`_)
+- Clarify how to interpret changes of ``membership`` over time. (`#2056 <https://github.com/matrix-org/matrix-doc/issues/2056>`_)
+- Clarify exactly what invite_room_state consists of. (`#2067 <https://github.com/matrix-org/matrix-doc/issues/2067>`_)
+- Clarify how the content repository works, and what it is used for. (`#2068 <https://github.com/matrix-org/matrix-doc/issues/2068>`_)
+- Clarify the order events in chunk are returned in for ``/messages``. (`#2069 <https://github.com/matrix-org/matrix-doc/issues/2069>`_)
+- Clarify the key object definition for the key management API. (`#2083 <https://github.com/matrix-org/matrix-doc/issues/2083>`_)
+- Reorganize information about events into a common section. (`#2087 <https://github.com/matrix-org/matrix-doc/issues/2087>`_)
+- De-duplicate ``/state/<event_type>`` endpoints, clarifying that the ``<state_key>`` is optional. (`#2088 <https://github.com/matrix-org/matrix-doc/issues/2088>`_)
+- Clarify when and where CORS headers should be returned. (`#2089 <https://github.com/matrix-org/matrix-doc/issues/2089>`_)
+- Clarify when authorization and rate-limiting are not applicable. (`#2090 <https://github.com/matrix-org/matrix-doc/issues/2090>`_)
+- Clarify that ``/register`` must produce valid Matrix User IDs. (`#2091 <https://github.com/matrix-org/matrix-doc/issues/2091>`_)
+- Clarify how ``unread_notifications`` is calculated. (`#2097 <https://github.com/matrix-org/matrix-doc/issues/2097>`_)
+- Clarify what a "module" is and update feature profiles for clients. (`#2098 <https://github.com/matrix-org/matrix-doc/issues/2098>`_)
+
+
 r0.4.0
 ======
 
diff --git a/changelogs/client_server/newsfragments/1650.clarification b/changelogs/client_server/newsfragments/1650.clarification
deleted file mode 100644
index 617b7ab6..00000000
--- a/changelogs/client_server/newsfragments/1650.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Change examples to use example.org instead of a real domain.
diff --git a/changelogs/client_server/newsfragments/1656.clarification b/changelogs/client_server/newsfragments/1656.clarification
deleted file mode 100644
index 0c8f4ad0..00000000
--- a/changelogs/client_server/newsfragments/1656.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that ``state_default`` in ``m.room.power_levels`` always defaults to 50.
diff --git a/changelogs/client_server/newsfragments/1701.feature b/changelogs/client_server/newsfragments/1701.feature
deleted file mode 100644
index cf6084ae..00000000
--- a/changelogs/client_server/newsfragments/1701.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add megolm session export format.
diff --git a/changelogs/client_server/newsfragments/1744.clarification b/changelogs/client_server/newsfragments/1744.clarification
deleted file mode 100644
index dfe838f1..00000000
--- a/changelogs/client_server/newsfragments/1744.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Add missing ``status_msg`` to ``m.presence`` schema.
diff --git a/changelogs/client_server/newsfragments/1786.feature b/changelogs/client_server/newsfragments/1786.feature
deleted file mode 100644
index 6f21778c..00000000
--- a/changelogs/client_server/newsfragments/1786.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for advertising experimental features to clients.
diff --git a/changelogs/client_server/newsfragments/1789.feature b/changelogs/client_server/newsfragments/1789.feature
deleted file mode 100644
index 97c1e5ca..00000000
--- a/changelogs/client_server/newsfragments/1789.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a generic SSO login API.
diff --git a/changelogs/client_server/newsfragments/1790.feature b/changelogs/client_server/newsfragments/1790.feature
deleted file mode 100644
index 26dccd05..00000000
--- a/changelogs/client_server/newsfragments/1790.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a mechanism for servers to redirect clients to an alternative homeserver after logging in.
diff --git a/changelogs/client_server/newsfragments/1791.feature b/changelogs/client_server/newsfragments/1791.feature
deleted file mode 100644
index 0a854c8f..00000000
--- a/changelogs/client_server/newsfragments/1791.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add room version upgrades.
diff --git a/changelogs/client_server/newsfragments/1817.deprecation b/changelogs/client_server/newsfragments/1817.deprecation
deleted file mode 100644
index 2c52d198..00000000
--- a/changelogs/client_server/newsfragments/1817.deprecation
+++ /dev/null
@@ -1 +0,0 @@
-Remove references to presence lists.
diff --git a/changelogs/client_server/newsfragments/1829.feature b/changelogs/client_server/newsfragments/1829.feature
deleted file mode 100644
index 107291f3..00000000
--- a/changelogs/client_server/newsfragments/1829.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support optional features by having clients query for capabilities.
diff --git a/changelogs/client_server/newsfragments/1838.clarification b/changelogs/client_server/newsfragments/1838.clarification
deleted file mode 100644
index b0f05203..00000000
--- a/changelogs/client_server/newsfragments/1838.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling mistakes throughout the specification.
diff --git a/changelogs/client_server/newsfragments/1853.clarification b/changelogs/client_server/newsfragments/1853.clarification
deleted file mode 100644
index b0f05203..00000000
--- a/changelogs/client_server/newsfragments/1853.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling mistakes throughout the specification.
diff --git a/changelogs/client_server/newsfragments/1860.clarification b/changelogs/client_server/newsfragments/1860.clarification
deleted file mode 100644
index b0f05203..00000000
--- a/changelogs/client_server/newsfragments/1860.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling mistakes throughout the specification.
diff --git a/changelogs/client_server/newsfragments/1873.new b/changelogs/client_server/newsfragments/1873.new
deleted file mode 100644
index 724a4308..00000000
--- a/changelogs/client_server/newsfragments/1873.new
+++ /dev/null
@@ -1 +0,0 @@
-``GET /account_data`` routes.
diff --git a/changelogs/client_server/newsfragments/1874.feature b/changelogs/client_server/newsfragments/1874.feature
deleted file mode 100644
index bdab5464..00000000
--- a/changelogs/client_server/newsfragments/1874.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add ``M_RESOURCE_LIMIT_EXCEEDED`` as an error code for when homeservers exceed limits imposed on them.
diff --git a/changelogs/client_server/newsfragments/1875.feature b/changelogs/client_server/newsfragments/1875.feature
deleted file mode 100644
index 0a854c8f..00000000
--- a/changelogs/client_server/newsfragments/1875.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add room version upgrades.
diff --git a/changelogs/client_server/newsfragments/1879.feature b/changelogs/client_server/newsfragments/1879.feature
deleted file mode 100644
index 107291f3..00000000
--- a/changelogs/client_server/newsfragments/1879.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support optional features by having clients query for capabilities.
diff --git a/changelogs/client_server/newsfragments/1889.clarification b/changelogs/client_server/newsfragments/1889.clarification
deleted file mode 100644
index 2737a7ee..00000000
--- a/changelogs/client_server/newsfragments/1889.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Add the missing ``m.push_rules`` event schema.
diff --git a/changelogs/client_server/newsfragments/1891.clarification b/changelogs/client_server/newsfragments/1891.clarification
deleted file mode 100644
index ef4edfb4..00000000
--- a/changelogs/client_server/newsfragments/1891.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify how modern day local echo is meant to be solved by clients.
diff --git a/changelogs/client_server/newsfragments/1908.feature b/changelogs/client_server/newsfragments/1908.feature
deleted file mode 100644
index 1c64d826..00000000
--- a/changelogs/client_server/newsfragments/1908.feature
+++ /dev/null
@@ -1 +0,0 @@
-Emit ``M_UNSUPPORTED_ROOM_VERSION`` error codes where applicable on ``/createRoom`` and ``/invite`` APIs.
diff --git a/changelogs/client_server/newsfragments/1933.clarification b/changelogs/client_server/newsfragments/1933.clarification
deleted file mode 100644
index b0f05203..00000000
--- a/changelogs/client_server/newsfragments/1933.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling mistakes throughout the specification.
diff --git a/changelogs/client_server/newsfragments/1969.clarification b/changelogs/client_server/newsfragments/1969.clarification
deleted file mode 100644
index b0f05203..00000000
--- a/changelogs/client_server/newsfragments/1969.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling mistakes throughout the specification.
diff --git a/changelogs/client_server/newsfragments/1975.clarification b/changelogs/client_server/newsfragments/1975.clarification
deleted file mode 100644
index ac118bfd..00000000
--- a/changelogs/client_server/newsfragments/1975.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that ``width`` and ``height`` are required parameters on ``/_matrix/media/r0/thumbnail/{serverName}/{mediaId}``.
diff --git a/changelogs/client_server/newsfragments/1988.clarification b/changelogs/client_server/newsfragments/1988.clarification
deleted file mode 100644
index b0f05203..00000000
--- a/changelogs/client_server/newsfragments/1988.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling mistakes throughout the specification.
diff --git a/changelogs/client_server/newsfragments/1989.clarification b/changelogs/client_server/newsfragments/1989.clarification
deleted file mode 100644
index b0f05203..00000000
--- a/changelogs/client_server/newsfragments/1989.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling mistakes throughout the specification.
diff --git a/changelogs/client_server/newsfragments/1991.clarification b/changelogs/client_server/newsfragments/1991.clarification
deleted file mode 100644
index b0f05203..00000000
--- a/changelogs/client_server/newsfragments/1991.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling mistakes throughout the specification.
diff --git a/changelogs/client_server/newsfragments/1992.clarification b/changelogs/client_server/newsfragments/1992.clarification
deleted file mode 100644
index b0f05203..00000000
--- a/changelogs/client_server/newsfragments/1992.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling mistakes throughout the specification.
diff --git a/changelogs/client_server/newsfragments/1999.clarification b/changelogs/client_server/newsfragments/1999.clarification
deleted file mode 100644
index 748c55f2..00000000
--- a/changelogs/client_server/newsfragments/1999.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify how ``m.login.dummy`` can be used to disambiguate login flows.
diff --git a/changelogs/client_server/newsfragments/2016.clarification b/changelogs/client_server/newsfragments/2016.clarification
deleted file mode 100644
index 77ea0d4c..00000000
--- a/changelogs/client_server/newsfragments/2016.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Remove ``prev_content`` from the redaction algorithm's essential keys list.
diff --git a/changelogs/client_server/newsfragments/2020.feature b/changelogs/client_server/newsfragments/2020.feature
deleted file mode 100644
index 0d7c7eb8..00000000
--- a/changelogs/client_server/newsfragments/2020.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a ``.m.rule.tombstone`` default push rule for room ugprade notifications.
diff --git a/changelogs/client_server/newsfragments/2025.clarification b/changelogs/client_server/newsfragments/2025.clarification
deleted file mode 100644
index 9e99b23d..00000000
--- a/changelogs/client_server/newsfragments/2025.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix the ``third_party_signed`` definitions for the join APIs.
diff --git a/changelogs/client_server/newsfragments/2026.feature b/changelogs/client_server/newsfragments/2026.feature
deleted file mode 100644
index f82b9aea..00000000
--- a/changelogs/client_server/newsfragments/2026.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for sending server notices to clients.
diff --git a/changelogs/client_server/newsfragments/2027.clarification b/changelogs/client_server/newsfragments/2027.clarification
deleted file mode 100644
index db74ea56..00000000
--- a/changelogs/client_server/newsfragments/2027.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify why User Interactive Auth is used on password changes and how access tokens are handled.
diff --git a/changelogs/client_server/newsfragments/2028.clarification b/changelogs/client_server/newsfragments/2028.clarification
deleted file mode 100644
index 75e21e74..00000000
--- a/changelogs/client_server/newsfragments/2028.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that devices are deleted upon logout.
diff --git a/changelogs/client_server/newsfragments/2029.clarification b/changelogs/client_server/newsfragments/2029.clarification
deleted file mode 100644
index 95b65481..00000000
--- a/changelogs/client_server/newsfragments/2029.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Add ``M_NOT_FOUND`` error definition for deleting room aliases.
diff --git a/changelogs/client_server/newsfragments/2030.feature b/changelogs/client_server/newsfragments/2030.feature
deleted file mode 100644
index b5975a73..00000000
--- a/changelogs/client_server/newsfragments/2030.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add MSISDN (phone number) support to User-Interactive Authentication.
diff --git a/changelogs/client_server/newsfragments/2031.clarification b/changelogs/client_server/newsfragments/2031.clarification
deleted file mode 100644
index 9bed3bcc..00000000
--- a/changelogs/client_server/newsfragments/2031.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Add missing ``reason`` to ``m.call.hangup``.
diff --git a/changelogs/client_server/newsfragments/2032.clarification b/changelogs/client_server/newsfragments/2032.clarification
deleted file mode 100644
index e497b8be..00000000
--- a/changelogs/client_server/newsfragments/2032.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify how redactions affect room state.
diff --git a/changelogs/client_server/newsfragments/2035.feature b/changelogs/client_server/newsfragments/2035.feature
deleted file mode 100644
index 47029c28..00000000
--- a/changelogs/client_server/newsfragments/2035.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add the option to lazy-load room members for increased client performance.
diff --git a/changelogs/client_server/newsfragments/2036.clarification b/changelogs/client_server/newsfragments/2036.clarification
deleted file mode 100644
index 96058b7b..00000000
--- a/changelogs/client_server/newsfragments/2036.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that ``FAIL_ERROR`` in autodiscovery is not limited to just homeservers.
diff --git a/changelogs/client_server/newsfragments/2041.clarification b/changelogs/client_server/newsfragments/2041.clarification
deleted file mode 100644
index 39bbddb5..00000000
--- a/changelogs/client_server/newsfragments/2041.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix example ``Content-Type`` for ``/media/upload`` request.
diff --git a/changelogs/client_server/newsfragments/2042.clarification b/changelogs/client_server/newsfragments/2042.clarification
deleted file mode 100644
index 4e17b99f..00000000
--- a/changelogs/client_server/newsfragments/2042.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that login flows are meant to be completed in order.
diff --git a/changelogs/client_server/newsfragments/2043.clarification b/changelogs/client_server/newsfragments/2043.clarification
deleted file mode 100644
index 9bb975fa..00000000
--- a/changelogs/client_server/newsfragments/2043.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that clients should not send read receipts for their own messages.
diff --git a/changelogs/client_server/newsfragments/2046.feature b/changelogs/client_server/newsfragments/2046.feature
deleted file mode 100644
index e54df535..00000000
--- a/changelogs/client_server/newsfragments/2046.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add ``id_server`` to ``/deactivate`` and ``/3pid/delete`` endpoints to unbind from a specific identity server.
diff --git a/changelogs/client_server/newsfragments/2051.clarification b/changelogs/client_server/newsfragments/2051.clarification
deleted file mode 100644
index 384daa11..00000000
--- a/changelogs/client_server/newsfragments/2051.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Use consistent examples of events throughout the specification.
diff --git a/changelogs/client_server/newsfragments/2052.clarification b/changelogs/client_server/newsfragments/2052.clarification
deleted file mode 100644
index 95bdc928..00000000
--- a/changelogs/client_server/newsfragments/2052.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify which push rule condition kinds exist.
diff --git a/changelogs/client_server/newsfragments/2053.clarification b/changelogs/client_server/newsfragments/2053.clarification
deleted file mode 100644
index 2a72a88e..00000000
--- a/changelogs/client_server/newsfragments/2053.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the required fields on ``m.file`` (and similar) messages.
diff --git a/changelogs/client_server/newsfragments/2054.clarification b/changelogs/client_server/newsfragments/2054.clarification
deleted file mode 100644
index e43aea2d..00000000
--- a/changelogs/client_server/newsfragments/2054.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that User-Interactive Authentication stages cannot be attempted more than once.
diff --git a/changelogs/client_server/newsfragments/2055.clarification b/changelogs/client_server/newsfragments/2055.clarification
deleted file mode 100644
index 3a57ef7e..00000000
--- a/changelogs/client_server/newsfragments/2055.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify which parameters apply in what scenarios on ``/register``.
diff --git a/changelogs/client_server/newsfragments/2056.clarification b/changelogs/client_server/newsfragments/2056.clarification
deleted file mode 100644
index 12521867..00000000
--- a/changelogs/client_server/newsfragments/2056.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify how to interpret changes of ``membership`` over time.
diff --git a/changelogs/client_server/newsfragments/2059.feature b/changelogs/client_server/newsfragments/2059.feature
deleted file mode 100644
index fde106ce..00000000
--- a/changelogs/client_server/newsfragments/2059.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for Olm sessions becoming un-stuck.
diff --git a/changelogs/client_server/newsfragments/2067.clarification b/changelogs/client_server/newsfragments/2067.clarification
deleted file mode 100644
index cc706274..00000000
--- a/changelogs/client_server/newsfragments/2067.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify exactly what invite_room_state consists of.
diff --git a/changelogs/client_server/newsfragments/2068.clarification b/changelogs/client_server/newsfragments/2068.clarification
deleted file mode 100644
index 77ad7125..00000000
--- a/changelogs/client_server/newsfragments/2068.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify how the content repository works, and what it is used for.
diff --git a/changelogs/client_server/newsfragments/2069.clarification b/changelogs/client_server/newsfragments/2069.clarification
deleted file mode 100644
index 127573a6..00000000
--- a/changelogs/client_server/newsfragments/2069.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the order events in chunk are returned in for ``/messages``.
diff --git a/changelogs/client_server/newsfragments/2072.feature b/changelogs/client_server/newsfragments/2072.feature
deleted file mode 100644
index c7d8bd76..00000000
--- a/changelogs/client_server/newsfragments/2072.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add interactive device verification, including a common framework for device verification.
diff --git a/changelogs/client_server/newsfragments/2083.clarification b/changelogs/client_server/newsfragments/2083.clarification
deleted file mode 100644
index 8083d85d..00000000
--- a/changelogs/client_server/newsfragments/2083.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the key object definition for the key management API.
diff --git a/changelogs/client_server/newsfragments/2087.clarification b/changelogs/client_server/newsfragments/2087.clarification
deleted file mode 100644
index 1974127d..00000000
--- a/changelogs/client_server/newsfragments/2087.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Reorganize information about events into a common section.
diff --git a/changelogs/client_server/newsfragments/2088.clarification b/changelogs/client_server/newsfragments/2088.clarification
deleted file mode 100644
index ae22d66a..00000000
--- a/changelogs/client_server/newsfragments/2088.clarification
+++ /dev/null
@@ -1 +0,0 @@
-De-duplicate ``/state/<event_type>`` endpoints, clarifying that the ``<state_key>`` is optional.
diff --git a/changelogs/client_server/newsfragments/2089.clarification b/changelogs/client_server/newsfragments/2089.clarification
deleted file mode 100644
index 17405adc..00000000
--- a/changelogs/client_server/newsfragments/2089.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify when and where CORS headers should be returned.
diff --git a/changelogs/client_server/newsfragments/2090.clarification b/changelogs/client_server/newsfragments/2090.clarification
deleted file mode 100644
index 23ab50f7..00000000
--- a/changelogs/client_server/newsfragments/2090.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify when authorization and rate-limiting are not applicable.
diff --git a/changelogs/client_server/newsfragments/2091.clarification b/changelogs/client_server/newsfragments/2091.clarification
deleted file mode 100644
index 2c4a276e..00000000
--- a/changelogs/client_server/newsfragments/2091.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that ``/register`` must produce valid Matrix User IDs.
diff --git a/changelogs/client_server/newsfragments/2097.clarification b/changelogs/client_server/newsfragments/2097.clarification
deleted file mode 100644
index 68d89bcc..00000000
--- a/changelogs/client_server/newsfragments/2097.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify how ``unread_notifications`` is calculated.
diff --git a/changelogs/client_server/newsfragments/2098.clarification b/changelogs/client_server/newsfragments/2098.clarification
deleted file mode 100644
index 1c8ba3ea..00000000
--- a/changelogs/client_server/newsfragments/2098.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify what a "module" is and update feature profiles for clients.
diff --git a/changelogs/client_server/newsfragments/2101.breaking b/changelogs/client_server/newsfragments/2101.breaking
deleted file mode 100644
index 68971171..00000000
--- a/changelogs/client_server/newsfragments/2101.breaking
+++ /dev/null
@@ -1 +0,0 @@
-Add a new ``submit_url`` field to the responses of ``/requestToken`` which older clients will not be able to handle correctly.
diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst
index bc2d66d7..dd6e3246 100644
--- a/specification/client_server_api.rst
+++ b/specification/client_server_api.rst
@@ -45,6 +45,7 @@ Other versions of this specification
 The following other versions are also available, in reverse chronological order:
 
 - `HEAD <https://matrix.org/docs/spec/client_server/unstable.html>`_: Includes all changes since the latest versioned release.
+- `r0.5.0 <https://matrix.org/docs/spec/client_server/r0.5.0.html>`_
 - `r0.4.0 <https://matrix.org/docs/spec/client_server/r0.4.0.html>`_
 - `r0.3.0 <https://matrix.org/docs/spec/client_server/r0.3.0.html>`_
 - `r0.2.0 <https://matrix.org/docs/spec/client_server/r0.2.0.html>`_