diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9fb33eb8..1f58e18ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.0 (March 2, 2017)
+
+BREAKING CHANGES
+
+- Update Amino names from "com.tendermint/..." to "tendermint/"
+
 ## 0.5.0 (March 2, 2017)
 
 BREAKING CHANGES
diff --git a/Gopkg.lock b/Gopkg.lock
index 6369f55bd..03473487d 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -126,20 +126,20 @@
   revision = "d8387025d2b9d158cf4efb07e7ebf814bcce2057"
 
 [[projects]]
-  branch = "develop"
   name = "github.com/tendermint/go-amino"
   packages = ["."]
-  revision = "3b9e2b978447707c255922bc3f87a53d55c400c9"
+  revision = "8b10adccaa7e4c2edc29c7b762169c34f4a36b32"
+  version = "0.9.1"
 
 [[projects]]
-  branch = "develop"
   name = "github.com/tendermint/tmlibs"
   packages = [
     "common",
     "db",
     "log"
   ]
-  revision = "d289c9286e816a37336289a75752752a751bc918"
+  revision = "e9cf47606cfcbdc28a7c16671b4a70b459e9d4cc"
+  version = "v0.8.0-dev"
 
 [[projects]]
   branch = "master"
@@ -166,6 +166,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "375b661ad202b62c6847981416c03ce0518c33ac293f5f0863b69af04d2af91f"
+  inputs-digest = "ff08a2810853f018b3ce056747de63fe4c1782268796f457d3fa28305de2bd1d"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 84a26764e..908e48f5f 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -26,12 +26,12 @@
 
 
 [[constraint]]
-  branch = "master"
   name = "github.com/btcsuite/btcutil"
+  branch = "master"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/howeyc/crc16"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/pkg/errors"
@@ -42,20 +42,20 @@
   version = "1.2.1"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/tendermint/ed25519"
-
-[[constraint]]
-  branch = "develop"
-  name = "github.com/tendermint/go-amino"
-
-[[constraint]]
-  branch = "develop"
-  name = "github.com/tendermint/tmlibs"
-
-[[constraint]]
   branch = "master"
+
+[[constraint]]
+  name = "github.com/tendermint/go-amino"
+  version = "0.9.1"
+
+[[constraint]]
+  name = "github.com/tendermint/tmlibs"
+  version = "0.8.0-dev"
+
+[[constraint]]
   name = "github.com/tyler-smith/go-bip39"
+  branch = "master"
 
 [prune]
   go-tests = true
diff --git a/version.go b/version.go
index 0281a5ea2..f641e03a3 100644
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
 package crypto
 
-const Version = "0.5.0"
+const Version = "0.6.0"