diff --git a/Gopkg.lock b/Gopkg.lock
index e4ae15af4..9c8b9f0ca 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -268,6 +268,7 @@
     "types"
   ]
   revision = "f9dce537281ffba5d1e047e6729429f7e5fb90c9"
+  version = "v0.11.0-rc0"
 
 [[projects]]
   branch = "master"
@@ -307,7 +308,6 @@
   version = "v0.8.0-rc0"
 
 [[projects]]
-  branch = "cwgoes/update-abci"
   name = "github.com/tendermint/tendermint"
   packages = [
     "blockchain",
@@ -347,7 +347,8 @@
     "types/priv_validator",
     "version"
   ]
-  revision = "9cc39a21ddbe8efd005aa5a001f54055a0d14fca"
+  revision = "73de99ecab464208f6ea3a96525f4e4b78425e61"
+  version = "v0.20.0-rc0"
 
 [[projects]]
   name = "github.com/tendermint/tmlibs"
@@ -460,6 +461,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "da12d07a753d17b8d9b834bb6b4b61617978c3c515fb38aa5dad10a66a8e78e8"
+  inputs-digest = "a6a5d886519fa9ca97a23715faa852ee14ecb5337e03641d19ea3d3d1c392fee"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index cb8fa2559..deabcd645 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -52,9 +52,9 @@
   name = "github.com/stretchr/testify"
   version = "~1.2.1"
 
-[[override]]
+[[constraint]]
   name = "github.com/tendermint/abci"
-  revision = "f9dce537281ffba5d1e047e6729429f7e5fb90c9"
+  version = "0.11.0-rc0"
 
 [[constraint]]
   name = "github.com/tendermint/go-crypto"
@@ -68,25 +68,23 @@
   name = "github.com/tendermint/iavl"
   version = "0.8.0-rc0"
 
-[[override]]
+[[constraint]]
   name = "github.com/tendermint/tendermint"
-  branch = "cwgoes/update-abci"
+  version = "0.20.0-rc0"
 
 [[constraint]]
   name = "github.com/tendermint/tmlibs"
   version = "~0.8.3-rc0"
+
+[[constraint]]
+  name = "github.com/cosmos/bech32cosmos"
+  branch = "master"
   
 # this got updated and broke, so locked to an old working commit ...
 [[override]]
   name = "google.golang.org/genproto"
   revision = "7fd901a49ba6a7f87732eb344f6e3c5b19d1b200"
 
-  [[constraint]]
-  name = "github.com/cosmos/bech32cosmos"
-  branch = "master"
-  
-
 [prune]
   go-tests = true
   unused-packages = true
-