diff --git a/CHANGELOG.md b/CHANGELOG.md
index c97b962a..19a43137 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,25 @@
 # Changelog
 
-## TBD
+## 0.22.4
+
+*July 14th, 2018*
+
+FEATURES:
+- [tools] Merged in from github.com/tendermint/tools
 
 IMPROVEMENTS:
 - [genesis] removed deprecated `app_options` field.
 - [types] Genesis.AppStateJSON -> Genesis.AppState
 
+BUG FIXES:
+- [tools/tm-bench] Various fixes
+- [consensus] Wait for WAL to stop on shutdown
+- [abci] Fix #1891, pending requests cannot hang when abci server dies. Previously a crash in BeginBlock could leave tendermint in broken state.
+
 ## 0.22.3
 
+*July 10th, 2018*
+
 IMPROVEMENTS
 - Update dependencies
     * pin all values in Gopkg.toml to version or commit
@@ -29,7 +41,6 @@ BUG FIXES
     - NOTE: this is only for URI requests. JSONRPC requests and all responses
       will use quoted integers (the proto3 JSON standard).
 - [consensus] Fix halt on shutdown
-- [tm_bench] Fix method of computing start time, and end time
 
 ## 0.22.1
 
@@ -46,8 +57,6 @@ BUG FIXES
   already in the validator set.
 * [consensus] Shut down WAL properly.
 
-BUG FIXES:
-- [abci] Fix #1891, pending requests cannot hang when abci server dies. Previously a crash in BeginBlock could leave tendermint in broken state.
 
 ## 0.22.0
 
diff --git a/version/version.go b/version/version.go
index 4e677b5f..165f2582 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,13 +4,13 @@ package version
 const (
 	Maj = "0"
 	Min = "22"
-	Fix = "3"
+	Fix = "4"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.22.3"
+	Version = "0.22.4"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string