diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce684911a..52006fe0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ FEATURES
   * A "simulate" query has been added to determine how much gas a transaction will need
   * Modules can include their own gas costs for execution of particular message types
 
+## 0.17.1 (May 17, 2018)
+
+Update to Tendermint v0.19.4 (fixes a consensus bug and improves logging)
+
 ## 0.17.0 (May 15, 2018)
 
 BREAKING CHANGES
diff --git a/Gopkg.lock b/Gopkg.lock
index 9aff8fe56..1bb4ec31a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -341,8 +341,8 @@
     "types/priv_validator",
     "version"
   ]
-  revision = "03f6a29a64fc4d26322a90839b892014d2cb90a5"
-  version = "v0.19.3-rc0"
+  revision = "19ccd1842fe5efffcc2ff32e6cfc127ca0cd1f9b"
+  version = "v0.19.4-rc0"
 
 [[projects]]
   name = "github.com/tendermint/tmlibs"
@@ -457,6 +457,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "30cd9c49b9e87f62f40a02fd0ba35a2d67a519ef781e06316246b307e6be638d"
+  inputs-digest = "8c37fee3e6d3034b865c68185f4796223fe53b1b0ee4a305adbee5f53c50bfce"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 5fe068df6..13060b061 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -70,7 +70,7 @@
 
 [[constraint]]
   name = "github.com/tendermint/tendermint"
-  version = "0.19.3-rc0"
+  version = "0.19.4-rc0"
 
 [[override]]
   name = "github.com/tendermint/tmlibs"