diff --git a/Gopkg.lock b/Gopkg.lock
index 6176499b08..5d0691f08f 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -237,7 +237,7 @@
     "leveldb/table",
     "leveldb/util"
   ]
-  revision = "c7a14d4b00e222eab6111b4cd1af829c13f53ec2"
+  revision = "169b1b37be738edb2813dab48c97a549bcf99bb5"
 
 [[projects]]
   branch = "develop"
@@ -280,7 +280,7 @@
     ".",
     "data"
   ]
-  revision = "3bd40838076a5c18fe2092b9de022787698b24a3"
+  revision = "26b0b2772d913790a42d2cfac4f4a055764dbfaa"
 
 [[projects]]
   name = "github.com/tendermint/iavl"
@@ -328,7 +328,7 @@
     "version",
     "wire"
   ]
-  revision = "6120a4c5e4f4b0ea9d5f22cedee949b862b11a5e"
+  revision = "cd2ba4aa7f95e16fe99570260ad58415e7ad4660"
 
 [[projects]]
   branch = "develop"
@@ -346,7 +346,7 @@
     "pubsub",
     "pubsub/query"
   ]
-  revision = "26f2ab65f82cfc6873c312e8030104c47c05f10e"
+  revision = "b1cc688a61c53e39b92ceb5df370e3c94b19da4c"
 
 [[projects]]
   branch = "master"
@@ -362,7 +362,7 @@
     "ripemd160",
     "salsa20/salsa"
   ]
-  revision = "91a49db82a88618983a78a06c1cbd4e00ab749ab"
+  revision = "c7dcf104e3a7a1417abc0230cb0d5240d764159d"
 
 [[projects]]
   branch = "master"
@@ -377,13 +377,13 @@
     "netutil",
     "trace"
   ]
-  revision = "22ae77b79946ea320088417e4d50825671d82d57"
+  revision = "ae89d30ce0c63142b652837da33d782e2b0a9b25"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/sys"
   packages = ["unix"]
-  revision = "dd2ff4accc098aceecb86b36eaa7829b2a17b1c9"
+  revision = "c28acc882ebcbfbe8ce9f0f14b9ac26ee138dd51"
 
 [[projects]]
   name = "golang.org/x/text"
@@ -410,7 +410,7 @@
   branch = "master"
   name = "google.golang.org/genproto"
   packages = ["googleapis/rpc/status"]
-  revision = "2c5e7ac708aaa719366570dd82bda44541ca2a63"
+  revision = "df60624c1e9b9d2973e889c7a1cff73155da81c4"
 
 [[projects]]
   name = "google.golang.org/grpc"
@@ -451,6 +451,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "75e68c7011e72105ad6c3899566307c831432a0dc32c6b21e650946c65a40c08"
+  inputs-digest = "3d1aebf798b51882ed5281b0ca0a3766c32cdb08592de57dd3d574a4b3e67987"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index abb5df54d9..1cbd701e21 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -69,6 +69,10 @@
   branch = "master"
   name = "github.com/tendermint/go-wire"
 
+[[override]]
+  branch = "develop"
+  name = "github.com/tendermint/go-amino"
+
 [[constraint]]
   branch = "master"
   name = "github.com/tendermint/iavl"