diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb289018e28..0e4bfdd6495 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.5.5 (Unreleased)
+
+BUG FIXES:
+  * server: Fix panic on upgrade to 0.5.3 or 0.5.4 [GH-2266]
+
 ## 0.5.4 (January 31, 2017)
 
 IMPROVEMENTS:
diff --git a/version.go b/version.go
index 60a459bc5a2..ffb039e50e0 100644
--- a/version.go
+++ b/version.go
@@ -5,9 +5,9 @@ var GitCommit string
 var GitDescribe string
 
 // The main version number that is being run at the moment.
-const Version = "0.5.4"
+const Version = "0.5.5"
 
 // A pre-release marker for the version. If this is "" (empty string)
 // then it means that it is a final release. Otherwise, this is a pre-release
 // such as "dev" (in development), "beta", "rc1", etc.
-const VersionPrerelease = ""
+const VersionPrerelease = "dev"