diff --git a/Cargo.lock b/Cargo.lock
index a29dbb9..a2a8380 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1108,7 +1108,7 @@ dependencies = [
 
 [[package]]
 name = "tendermint"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1196,7 +1196,7 @@ dependencies = [
  "subtle 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "subtle-encoding 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tendermint 0.5.0",
+ "tendermint 0.6.0",
  "tiny-bip39 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wait-timeout 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "yubihsm 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 46c0508..eaeb0bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ signatory-dalek = "0.11"
 signatory-secp256k1 = "0.11"
 subtle = "2"
 subtle-encoding = { version = "0.3", features = ["bech32-preview"] }
-tendermint = { version = "0.5", path = "tendermint-rs", features = ["amino-types", "secret-connection"] }
+tendermint = { version = "0.6", path = "tendermint-rs", features = ["amino-types", "secret-connection"] }
 tiny-bip39 = "0.6"
 wait-timeout = "0.2"
 yubihsm = { version = "0.22", features = ["setup", "usb"], optional = true }
diff --git a/img/tendermint.png b/img/tendermint.png
index 1576241..1289813 100644
Binary files a/img/tendermint.png and b/img/tendermint.png differ
diff --git a/tendermint-rs/CHANGES.md b/tendermint-rs/CHANGES.md
index f4ef832..a98f4a6 100644
--- a/tendermint-rs/CHANGES.md
+++ b/tendermint-rs/CHANGES.md
@@ -1,5 +1,14 @@
+## [0.6.0] (2019-04-16)
+
+This release is compatible with [tendermint v0.31]
+
+- Add `tendermint::Address`, `tendermint::account::Id`, `tendermint::Moniker`,
+  and improve `serde` serializer support ([#228]).
+
 ## [0.5.0] (2019-03-13)
 
+This release is compatible with [tendermint v0.30]
+
 - Rename `SecretConnectionKey` to `secret_connection::PublicKey`, add
   `secret_connection::PeerId` ([#219])
 - Move `ConsensusState` under `chain::state` ([#205])
@@ -14,22 +23,18 @@
 
 ## 0.2.0 (2019-01-23)
 
-This release is compatible with tendermint [v0.29]
+This release is compatible with [tendermint v0.29]
 
 - Update to x25519-dalek v0.4.4 (#158)
 - Consistent ordering of `BlockID` and `Timestamps` in vote and proposal messages (#159)
 - Remove `PoisonPillMsg` previously used to shut-down the kms (#162)
 
-[v0.29]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0290
-
 ## 0.1.5 (2019-01-18)
 
-This release is compatible with tendermint [v0.28]
+This release is compatible with [tendermint v0.28]
 
 - Split `PubKeyMsg` into `PubKeyRequest` and `PubKeyResponse` (#141)
 - Migrate to Rust 2018 edition (#138)
-
-[v0.28]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0280
  
 ## 0.1.4 (2018-12-02)
 
@@ -53,7 +58,13 @@ This release is compatible with tendermint [v0.28]
 
 - Initial release
 
+[0.6.0]: https://github.com/tendermint/kms/pull/229
+[tendermint v0.31]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0310
+[#228]: https://github.com/tendermint/kms/pull/228
 [0.5.0]: https://github.com/tendermint/kms/pull/220
+[tendermint v0.30]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0300
 [#219]: https://github.com/tendermint/kms/pull/219
 [#205]: https://github.com/tendermint/kms/pull/219
 [#181]: https://github.com/tendermint/kms/pull/181
+[tendermint v0.29]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0290
+[tendermint v0.28]: https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0280
diff --git a/tendermint-rs/Cargo.toml b/tendermint-rs/Cargo.toml
index b4ddfb8..e32bff5 100644
--- a/tendermint-rs/Cargo.toml
+++ b/tendermint-rs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name       = "tendermint"
-version    = "0.5.0" # Also update `html_root_url` in lib.rs when bumping this
+version    = "0.6.0" # Also update `html_root_url` in lib.rs when bumping this
 license    = "Apache-2.0"
 homepage   = "https://www.tendermint.com/"
 repository = "https://github.com/tendermint/kms/tree/master/crates/tendermint"
diff --git a/tendermint-rs/src/lib.rs b/tendermint-rs/src/lib.rs
index 25a7156..af7effb 100644
--- a/tendermint-rs/src/lib.rs
+++ b/tendermint-rs/src/lib.rs
@@ -16,7 +16,7 @@
 #![forbid(unsafe_code)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
-    html_root_url = "https://docs.rs/tendermint/0.5.0"
+    html_root_url = "https://docs.rs/tendermint/0.6.0"
 )]
 
 #[cfg(feature = "amino-types")]