diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aeaeffb3..c67b4f4d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.7 (Unreleased)
+
+BACKWARDS INCOMPATIBILITIES / NOTES:
+
+FEATURES:
+
+IMPROVEMENTS:
+
+BUG FIXES:
+
 ## 0.6.16 (May 9, 2016)
 
 BACKWARDS INCOMPATIBILITIES / NOTES:
diff --git a/terraform/version.go b/terraform/version.go
index 2fb189f59..9f0ce0b13 100644
--- a/terraform/version.go
+++ b/terraform/version.go
@@ -1,9 +1,9 @@
 package terraform
 
 // The main version number that is being run at the moment.
-const Version = "0.6.16"
+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"