diff --git a/CHANGELOG.md b/CHANGELOG.md
index 271be8fb9..c017ca91a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.17.5
+
+*June 5, 2018*
+
+Update to Tendermint v0.19.9 (Fix evidence reactor, mempool deadlock, WAL panic,
+memory leak)
+
 ## 0.17.4
 
 *May 31, 2018*
diff --git a/Gopkg.lock b/Gopkg.lock
index 3873b9155..a08427042 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -164,8 +164,8 @@
 [[projects]]
   name = "github.com/pelletier/go-toml"
   packages = ["."]
-  revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
-  version = "v1.1.0"
+  revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
+  version = "v1.2.0"
 
 [[projects]]
   name = "github.com/pkg/errors"
@@ -327,6 +327,7 @@
     "p2p/conn",
     "p2p/pex",
     "p2p/upnp",
+    "privval",
     "proxy",
     "rpc/client",
     "rpc/core",
@@ -341,11 +342,10 @@
     "state/txindex/kv",
     "state/txindex/null",
     "types",
-    "types/priv_validator",
     "version"
   ]
-  revision = "a017f2fdd41496a81e04a2216630a405189da6e2"
-  version = "v0.19.7-rc0"
+  revision = "775fef31c2b8fb7ea36f0d57bae3bfa74d353100"
+  version = "v0.19.9-rc0"
 
 [[projects]]
   name = "github.com/tendermint/tmlibs"
@@ -360,8 +360,8 @@
     "log",
     "merkle"
   ]
-  revision = "d970af87248a4e162590300dbb74e102183a417d"
-  version = "v0.8.3"
+  revision = "692f1d86a6e2c0efa698fd1e4541b68c74ffaf38"
+  version = "v0.8.4"
 
 [[projects]]
   branch = "master"
@@ -377,7 +377,7 @@
     "ripemd160",
     "salsa20/salsa"
   ]
-  revision = "ab813273cd59e1333f7ae7bff5d027d4aadf528c"
+  revision = "78e79280f680f7dd6b8e48c751887111ebdbcbd8"
 
 [[projects]]
   branch = "master"
@@ -458,6 +458,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "a3a75136fb6921c4c4d413e4c8366f203b77367762763c97b8669ea854fbd62d"
+  inputs-digest = "71d11bd2a8f3f46ba3fd16759b501ad5b6b48037717d82020ebb25e021b67117"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index b8838920a..c25623bba 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -74,11 +74,11 @@
 
 [[constraint]]
   name = "github.com/tendermint/tendermint"
-  version = "0.19.7-rc0"
+  version = "0.19.9-rc0"
 
 [[override]]
   name = "github.com/tendermint/tmlibs"
-  version = "~0.8.3-rc0"
+  version = "~0.8.4"
   
 # this got updated and broke, so locked to an old working commit ...
 [[override]]
diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go
index 66a8a4085..73f5ad2c5 100644
--- a/client/lcd/lcd_test.go
+++ b/client/lcd/lcd_test.go
@@ -24,7 +24,7 @@ import (
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	tmrpc "github.com/tendermint/tendermint/rpc/lib/server"
 	tmtypes "github.com/tendermint/tendermint/types"
-	pvm "github.com/tendermint/tendermint/types/priv_validator"
+	pvm "github.com/tendermint/tendermint/privval"
 	"github.com/tendermint/tmlibs/cli"
 	dbm "github.com/tendermint/tmlibs/db"
 	"github.com/tendermint/tmlibs/log"
diff --git a/server/init.go b/server/init.go
index 68a1709bc..512751bed 100644
--- a/server/init.go
+++ b/server/init.go
@@ -20,7 +20,7 @@ import (
 	cfg "github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/p2p"
 	tmtypes "github.com/tendermint/tendermint/types"
-	pvm "github.com/tendermint/tendermint/types/priv_validator"
+	pvm "github.com/tendermint/tendermint/privval"
 	tmcli "github.com/tendermint/tmlibs/cli"
 	cmn "github.com/tendermint/tmlibs/common"
 	dbm "github.com/tendermint/tmlibs/db"
diff --git a/server/start.go b/server/start.go
index 23e38749b..9bf2d30cd 100644
--- a/server/start.go
+++ b/server/start.go
@@ -10,7 +10,7 @@ import (
 	tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
 	"github.com/tendermint/tendermint/node"
 	"github.com/tendermint/tendermint/proxy"
-	pvm "github.com/tendermint/tendermint/types/priv_validator"
+	pvm "github.com/tendermint/tendermint/privval"
 	cmn "github.com/tendermint/tmlibs/common"
 )
 
diff --git a/server/tm_cmds.go b/server/tm_cmds.go
index d581ca5f7..4d8edacab 100644
--- a/server/tm_cmds.go
+++ b/server/tm_cmds.go
@@ -11,7 +11,7 @@ import (
 
 	tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
 	"github.com/tendermint/tendermint/p2p"
-	pvm "github.com/tendermint/tendermint/types/priv_validator"
+	pvm "github.com/tendermint/tendermint/privval"
 )
 
 // ShowNodeIDCmd - ported from Tendermint, dump node ID to stdout
diff --git a/version/version.go b/version/version.go
index 0871aee00..be9f7858b 100644
--- a/version/version.go
+++ b/version/version.go
@@ -7,9 +7,9 @@ package version
 
 const Maj = "0"
 const Min = "17"
-const Fix = "4"
+const Fix = "5"
 
-const Version = "0.17.4"
+const Version = "0.17.5"
 
 // GitCommit set by build flags
 var GitCommit = ""