diff --git a/Gopkg.lock b/Gopkg.lock
index da17c2efff..c9e3eb67e5 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -343,7 +343,7 @@
   revision = "cd2ba4aa7f95e16fe99570260ad58415e7ad4660"
 
 [[projects]]
-  branch = "develop"
+  branch = "rigel/cli-refactor"
   name = "github.com/tendermint/tmlibs"
   packages = [
     "autofile",
diff --git a/Gopkg.toml b/Gopkg.toml
index 1cbd701e21..fe3de57e8e 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -82,8 +82,9 @@
   name = "github.com/tendermint/tendermint"
 
 [[override]]
-  branch = "develop"
+  branch = "rigel/cli-refactor"
   name = "github.com/tendermint/tmlibs"
+  #version = "6ef3e36e82ab95739c5beacddca8e931f62d2cef"
 
 [prune]
   go-tests = true