diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82f20ed35..54e4fab86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 ## 0.7.6
 *Nov 27th, 2018*
 
+IMPROVEMENT
+
+- [tendermint] Update to [v0.26.4](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0264) 
+
 BUG FIXES
 
 - [node] Fix issue #168 with unexpected database corruption
diff --git a/Gopkg.lock b/Gopkg.lock
index 0fd898ec2..637f3e9a3 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -18,11 +18,11 @@
   revision = "67e573d211ace594f1366b4ce9d39726c4b19bd0"
 
 [[projects]]
-  digest = "1:d574810a99a766018d4532cc96dc4e7ddf51a66715f2e16d0a8fcc8be0b502a6"
+  digest = "1:70d33e721fdb80ae8a8529d87a5e4093acb8f14c513a092fb7d71750cb3a8438"
   name = "github.com/danil-lashin/iavl"
   packages = ["."]
   pruneopts = "UT"
-  revision = "0f508ab5fe04b726c976a26459d141108e4a28ca"
+  revision = "ff321d758752b411f0fb01f86370395c314bc13a"
 
 [[projects]]
   digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec"
@@ -372,7 +372,7 @@
   version = "v0.14.1"
 
 [[projects]]
-  digest = "1:a13720e23c8709cb6bf7626580f1f546485860f5e58df2fb95a0dfe300d97ec2"
+  digest = "1:a38b9d6e0e2b28b5f046d72cec632d2bdbb736ef9f1693665cd7bbafea763b66"
   name = "github.com/tendermint/tendermint"
   packages = [
     "abci/client",
@@ -426,8 +426,8 @@
     "version",
   ]
   pruneopts = "UT"
-  revision = "22dcc92232cd04ce7381043e09d85dd536ae3b96"
-  version = "v0.26.3"
+  revision = "b771798d48c27630fb37b74c8e229da5a8b2042c"
+  version = "v0.26.4"
 
 [[projects]]
   digest = "1:1fdfa9436cc1c11afbdbfb56549e9201a92db0b0a0b7bef0797e7b68c9e8791f"
diff --git a/Gopkg.toml b/Gopkg.toml
index 7a4b5f545..2e11f18bb 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -43,11 +43,11 @@
 
 [[constraint]]
   name = "github.com/danil-lashin/iavl"
-  revision = "0f508ab5fe04b726c976a26459d141108e4a28ca"
+  revision = "ff321d758752b411f0fb01f86370395c314bc13a"
 
 [[constraint]]
   name = "github.com/tendermint/tendermint"
-  version = "=0.26.3"
+  version = "=0.26.4"
 
 [[constraint]]
   branch = "v1"