diff --git a/CHANGES.rst b/CHANGES.rst
index 6659c6671a8f486c0eaafd346d093f367adab08b..61512db418a7112a21ce26382976c40d8b8ccf60 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+Changes in synapse v0.20.0 (2017-04-07)
+=======================================
+
+Bug fixes:
+
+* Fix joining rooms over federation where not all servers in the room saw the
+  new server had joined (PR #2094)
+
+
 Changes in synapse v0.20.0-rc1 (2017-03-30)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 580927abf4f4cbed9aba946ccae5f36eec11887f..2e5f4e0ead53ef604cd361faddc9dd05a5185a5c 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.20.0-rc1"
+__version__ = "0.20.0"