diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24ec19d7..154c51c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,45 @@
 # Changelog
 
-## TBD
+## 0.22.0
 
-IMPROVEMENTS:
- - [crypto] Make public key size into public constants
-
-BUG FIXES:
-- [rpc] limited number of HTTP/WebSocket connections
-  (`rpc.max_open_connections`) and gRPC connections
-  (`rpc.grpc_max_open_connections`). Check out [Running In
-  Production](https://tendermint.readthedocs.io/en/master/running-in-production.html)
-  guide if you want to increase them.
+*July 1st, 2018*
 
 BREAKING CHANGES:
 - [config] Rename `skip_upnp` to `upnp`, and turn it off by default.
+- [config] `MaxPacketMsgPayloadSize` -> `MaxPacketMsgSize`
+- [types] Update Amino to v0.10.1
+    * Amino is now fully proto3 compatible for the basic types
+    * JSON-encoded types now use the type name instead of the prefix bytes
+    * Integers are encoded as strings
+- [crypto] Update go-crypto to v0.10.0 and merge into `crypto`
+    * privKey.Sign returns error.
+    * ed25519 address is the first 20-bytes of the SHA256 of the pubkey
+    * `tmlibs/merkle` -> `crypto/merkle`. Uses SHA256 instead of RIPEMD160
+- [rpc] `syncing` is now called `catching_up`.
+
+FEATURES
+- [cmd] Added metrics (served under `/metrics` using a Prometheus client;
+  disabled by default). See the new `instrumentation` section in the config and
+  [metrics](https://tendermint.readthedocs.io/projects/tools/en/develop/metrics.html)
+  guide.
+- [p2p] Rudimentary IPv6 support
 
 IMPROVEMENT
 - [rpc/client] Supports https and wss now.
 - [p2p] Add IPv6 support to peering.
+- [crypto] Make public key size into public constants
+- [mempool] Log tx hash, not entire tx
+- [abci] Merged in github.com/tendermint/abci
+- [docs] Move from .rst to .md
+
+BUG FIXES:
+- [rpc] Limited number of HTTP/WebSocket connections
+  (`rpc.max_open_connections`) and gRPC connections
+  (`rpc.grpc_max_open_connections`). Check out [Running In
+  Production](https://tendermint.readthedocs.io/en/master/running-in-production.html)
+  guide if you want to increase them.
+- [consensus] Fix a halting bug where `create_empty_blocks=false`
+- [p2p] Fix panic in seed mode
 
 ## 0.21.0
 
@@ -34,13 +56,6 @@ IMPROVEMENT
 - [pubsub] Set default capacity to 0
 - [docs] Various improvements
 
-FEATURES
-
-- [main] added metrics (served under `/metrics` using a Prometheus client;
-  disabled by default). See the new `instrumentation` section in the config and
-  [metrics](https://tendermint.readthedocs.io/projects/tools/en/v0.21.0/metrics.html)
-  guide.
-
 BUG FIXES
 
 - [consensus] Fix an issue where we don't make blocks after `fast_sync` when `create_empty_blocks=false`
diff --git a/version/version.go b/version/version.go
index df553115..9be4c9d8 100644
--- a/version/version.go
+++ b/version/version.go
@@ -3,14 +3,14 @@ package version
 // Version components
 const (
 	Maj = "0"
-	Min = "21"
+	Min = "22"
 	Fix = "0"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.21.0"
+	Version = "0.22.0"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string