diff --git a/CHANGES.rst b/CHANGES.rst
index 31eee891daeaf52f2bf2e8ac58f00bbe5b208378..8824ece5a99231d4ea266357b907cb4ff82cc21c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,24 @@
+Changes in synapse 0.2.2 (2014-09-06)
+=====================================
+
+Homeserver:
+ * When the server returns state events it now also includes the previous 
+   content.
+ * Add support for inviting people when creating a new room.
+ * Make the homeserver inform the room via `m.room.aliases` when a new alias
+   is added for a room.
+ * Validate `m.room.power_level` events.
+
+Webclient:
+ * Add support for captchas on registration.
+ * Handle `m.room.aliases` events.
+ * Asynchronously send messages and show a local echo.
+ * Inform the UI when a message failed to send.
+ * Only autoscroll on receiving a new message if the user was already at the 
+   bottom of the screen.
+ * Add support for ban/kick reasons.
+ * Fix bug where we occaisonally saw duplicated join messages.
+
 Changes in synapse 0.2.1 (2014-09-03)
 =====================================
 
diff --git a/VERSION b/VERSION
index 0c62199f16ac1e2d7f7ae75b420c1231325dff4e..ee1372d33a29e27945406f0527f8af8e6ee119c9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.1
+0.2.2
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 440e6339662c3504993bcd1ab90895c7ae3f568e..1ed9cdcdf3e06c23e96dd0f897d513e82a1df2db 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"