diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27d5656b..e0f9ba90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Changelog
 
-## TBA
+## 0.22.6
+
+*July 24th, 2018*
+
+BUG FIXES
+
+- [rpc] Fix `/blockchain` endpoint
+    - (#2049) Fix OOM attack by returning error on negative input
+    - Fix result length to have max 20 (instead of 21) block metas
+- [rpc] Validate height is non-negative in `/abci_query`
+- [Gopkg] Fix versions in the toml
 
 ## 0.22.5
 
diff --git a/version/version.go b/version/version.go
index 70626437..5ef4aadb 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,13 +4,13 @@ package version
 const (
 	Maj = "0"
 	Min = "22"
-	Fix = "5"
+	Fix = "6"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.22.5"
+	Version = "0.22.6"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string