diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89714b22..5c1f6643 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+Sydent 2.1.0 (2020-09-10)
+=========================
+
+Features
+--------
+
+- Add a Dockerfile and allow environment variables `SYDENT_SERVER_NAME`, `SYDENT_PID_FILE` and `SYDENT_DB_PATH` to modify default configuration values. ([\#290](https://github.com/matrix-org/sydent/issues/290))
+- Add config options for controlling how email addresses are obfuscated in third party invites. ([\#311](https://github.com/matrix-org/sydent/issues/311))
+
+
+Bugfixes
+--------
+
+- Fix a bug in the error handling of 3PID session validation, if the token submitted is incorrect. ([\#296](https://github.com/matrix-org/sydent/issues/296))
+- Stop sending the unspecified `success` parameter in responses to `/requestToken` requests. ([\#302](https://github.com/matrix-org/sydent/issues/302))
+- Fix a bug causing Sydent to ignore `nextLink` parameters. ([\#303](https://github.com/matrix-org/sydent/issues/303))
+- Fix the HTTP status code returned during some error responses. ([\#305](https://github.com/matrix-org/sydent/issues/305))
+- Sydent now correctly enforces the valid characters in the `client_secret` parameter used in various endpoints. ([\#309](https://github.com/matrix-org/sydent/issues/309))
+
+
+Internal Changes
+----------------
+
+- Replace instances of Riot with Element. ([\#308](https://github.com/matrix-org/sydent/issues/308))
+
+
 Sydent 2.0.1 (2020-05-20)
 =========================
 
diff --git a/changelog.d/290.feature b/changelog.d/290.feature
deleted file mode 100644
index a987c58e..00000000
--- a/changelog.d/290.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a Dockerfile and allow environment variables `SYDENT_SERVER_NAME`, `SYDENT_PID_FILE` and `SYDENT_DB_PATH` to modify default configuration values.
\ No newline at end of file
diff --git a/changelog.d/296.bugfix b/changelog.d/296.bugfix
deleted file mode 100644
index b3d28e21..00000000
--- a/changelog.d/296.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug in the error handling of 3PID session validation, if the token submitted is incorrect.
diff --git a/changelog.d/302.bugfix b/changelog.d/302.bugfix
deleted file mode 100644
index 1b408dab..00000000
--- a/changelog.d/302.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Stop sending the unspecified `success` parameter in responses to `/requestToken` requests.
diff --git a/changelog.d/303.bugfix b/changelog.d/303.bugfix
deleted file mode 100644
index 46a9d777..00000000
--- a/changelog.d/303.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug causing Sydent to ignore `nextLink` parameters.
diff --git a/changelog.d/305.bugfix b/changelog.d/305.bugfix
deleted file mode 100644
index 9d51609e..00000000
--- a/changelog.d/305.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix the HTTP status code returned during some error responses.
diff --git a/changelog.d/308.misc b/changelog.d/308.misc
deleted file mode 100644
index 6f56fa66..00000000
--- a/changelog.d/308.misc
+++ /dev/null
@@ -1 +0,0 @@
-Replace instances of Riot with Element.
\ No newline at end of file
diff --git a/changelog.d/309.bugfix b/changelog.d/309.bugfix
deleted file mode 100644
index d776e409..00000000
--- a/changelog.d/309.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Sydent now correctly enforces the valid characters in the `client_secret` parameter used in various endpoints.
diff --git a/changelog.d/311.feature b/changelog.d/311.feature
deleted file mode 100644
index 42266b24..00000000
--- a/changelog.d/311.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add config options for controlling how email addresses are obfuscated in third party invites.
\ No newline at end of file
diff --git a/sydent/__init__.py b/sydent/__init__.py
index 3f390799..a33997dd 100644
--- a/sydent/__init__.py
+++ b/sydent/__init__.py
@@ -1 +1 @@
-__version__ = '2.0.1'
+__version__ = '2.1.0'