diff --git a/CHANGELOG b/CHANGELOG
index 7d1ada97c57..c20f27ad7db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+v 5.4.0
+  - Ability to edit own comments
+  - Documentation improvements
+  - Improve dashboard projects page
+  - Fixed nav for empty repos
+  - GitLab Markdown help page
+  - Misspelling fixes
+  - Added suppoort of unicorn and fog gems
+  - Added client list to API doc
+
 v 5.3.0
   - Refactored services 
   - Campfire service added
diff --git a/VERSION b/VERSION
index 03f488b076a..c5e18371adf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.3.0
+5.4.0.pre