diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62a208908d..5a35efd364 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 0.7.0 (UNRELEASED)
+
 ## 0.6.4 (March 16, 2016)
 
 BACKWARDS INCOMPATIBILITIES:
diff --git a/version.go b/version.go
index 21c713a0e8..c45bedfbeb 100644
--- a/version.go
+++ b/version.go
@@ -7,9 +7,9 @@ var (
 )
 
 // The main version number that is being run at the moment.
-const Version = "0.6.4"
+const Version = "0.7.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"