diff --git a/VERSION b/VERSION
index 64c6e2f46..a918a2aa1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.4a
+0.6.0
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 7e49e1fd0..1cef40925 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.5.4a"
+__version__ = "0.6.0"