diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c1f6643..970468c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+Sydent 2.2.0 (2020-09-11)
+=========================
+
+Bugfixes
+--------
+
+- Fix intermittent deadlock in Sentry integration. ([\#312](https://github.com/matrix-org/sydent/issues/312))
+
+
 Sydent 2.1.0 (2020-09-10)
 =========================
 
diff --git a/changelog.d/312.bugfix b/changelog.d/312.bugfix
deleted file mode 100644
index b0406319..00000000
--- a/changelog.d/312.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix intermittent deadlock in Sentry integration.
diff --git a/sydent/__init__.py b/sydent/__init__.py
index a33997dd..04188a16 100644
--- a/sydent/__init__.py
+++ b/sydent/__init__.py
@@ -1 +1 @@
-__version__ = '2.1.0'
+__version__ = '2.2.0'