diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29375a44f..ce684911a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.18.0 (TBD)
+
+FEATURES
+
+* [x/auth] Added ability to change pubkey to auth module
+* [baseapp] baseapp now has settable functions for filtering peers by address/port & public key
+* [sdk] Gas consumption is now measured as transactions are executed
+  * Transactions which run out of gas stop execution and revert state changes
+  * A "simulate" query has been added to determine how much gas a transaction will need
+  * Modules can include their own gas costs for execution of particular message types
+
 ## 0.17.0 (May 15, 2018)
 
 BREAKING CHANGES
@@ -12,14 +23,6 @@ FEATURES
 * [gaiad] Added `gaiad export` command to export current state to JSON
 * [x/bank] Tx tags with sender/recipient for indexing & later retrieval
 * [x/stake] Tx tags with delegator/candidate for delegation & unbonding, and candidate info for declare candidate / edit candidacy
-* [x/auth] Added ability to change pubkey to auth module
-* [baseapp] baseapp now has settable functions for filtering peers by address/port & public key
-* [sdk] Gas consumption is now measured as transactions are executed
-  * Transactions which run out of gas stop execution and revert state changes
-  * A "simulate" query has been added to determine how much gas a transaction will need
-  * Modules can include their own gas costs for execution of particular message types
-* [x/bank] Bank module now tags transactions with sender/recipient for indexing & later retrieval
-* [x/stake] Stake module now tags transactions with delegator/candidate for delegation & unbonding, and candidate info for declare candidate / edit candidacy
 
 IMPROVEMENTS
 
diff --git a/version/version.go b/version/version.go
index b8b59827d..116f1ff28 100644
--- a/version/version.go
+++ b/version/version.go
@@ -6,10 +6,10 @@ package version
 // TODO improve
 
 const Maj = "0"
-const Min = "17"
+const Min = "18"
 const Fix = "0"
 
-const Version = "0.17.0"
+const Version = "0.18.0-dev"
 
 // GitCommit set by build flags
 var GitCommit = ""