diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e910e36..b05b64dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,19 @@
 # Changelog
 
-## 0.23.0
+## 0.22.1
 
-*TBD*
+*July 5th, 2018*
+
+IMPROVEMENTS
+
+* Cleanup post repo-merge.
+* [docs] Various improvements.
+
+BUG FIXES
+
+* [state] Return error when EndBlock returns a 0-power validator that isn't
+  already in the validator set.
+* [consensus] Shut down WAL properly.
 
 ## 0.22.0
 
diff --git a/version/version.go b/version/version.go
index aac5dd58..68f1b483 100644
--- a/version/version.go
+++ b/version/version.go
@@ -3,14 +3,14 @@ package version
 // Version components
 const (
 	Maj = "0"
-	Min = "23"
-	Fix = "0"
+	Min = "22"
+	Fix = "1"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.23.0-dev"
+	Version = "0.22.1"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string