diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5936e6139..32c5b6359 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.6.0 (Unreleased)
+
 ## 0.5.3 (June 1, 2015)
 
 IMPROVEMENTS:
diff --git a/version.go b/version.go
index 985ddf754..3ae4855ae 100644
--- a/version.go
+++ b/version.go
@@ -4,9 +4,9 @@ package main
 var GitCommit string
 
 // The main version number that is being run at the moment.
-const Version = "0.5.3"
+const Version = "0.6.0"
 
 // 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"