diff --git a/CHANGES.rst b/CHANGES.rst
index 477a4047215ecc0df176007fe0e7afd432ce02d4..2c57a57a0153a89d6019b0ed4936fd1b602bed1b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+Changes in synapse 0.5.4 (2014-12-03)
+=====================================
+
+ * Fix presence bug where some rooms did not display presence updates for
+   remote users.
+ * Do not log SQL timing log lines when started with "-v"
+ * Fix potential memory leak.
+
 Changes in synapse 0.5.3c (2014-12-02)
 ======================================
 
diff --git a/VERSION b/VERSION
index b6f145ad190e7139246038624b08de3bc64d46ca..7d8568351b4f8d3809763af69f84d5499ef881d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.3c
+0.5.4
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 0b43932305d4db4d496b24b15d54a4afefd91633..723e15d506d30677caed68531a89b8c4ed0236b4 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.3c"
+__version__ = "0.5.4"