diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index bc3b36227626ca79b76423fb31c76c39d4dcf223..4ef9ce3ac48982ea8172209ea17e54b6dc59b6ef 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -191,31 +191,31 @@
 		},
 		{
 			"ImportPath": "golang.org/x/crypto/curve25519",
-			"Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+			"Rev": "02a186af8b62cb007f392270669b91be5527d39c"
 		},
 		{
 			"ImportPath": "golang.org/x/crypto/nacl/box",
-			"Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+			"Rev": "02a186af8b62cb007f392270669b91be5527d39c"
 		},
 		{
 			"ImportPath": "golang.org/x/crypto/nacl/secretbox",
-			"Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+			"Rev": "02a186af8b62cb007f392270669b91be5527d39c"
 		},
 		{
 			"ImportPath": "golang.org/x/crypto/poly1305",
-			"Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+			"Rev": "02a186af8b62cb007f392270669b91be5527d39c"
 		},
 		{
 			"ImportPath": "golang.org/x/crypto/ripemd160",
-			"Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+			"Rev": "02a186af8b62cb007f392270669b91be5527d39c"
 		},
 		{
 			"ImportPath": "golang.org/x/crypto/salsa20/salsa",
-			"Rev": "4d8f0cfeca8290cfc0091edf678a138ce669b1bb"
+			"Rev": "02a186af8b62cb007f392270669b91be5527d39c"
 		},
 		{
 			"ImportPath": "golang.org/x/net/context",
-			"Rev": "10576091dc82c9c109dddfb5ed77bdbbc87a9af8"
+			"Rev": "02a186af8b62cb007f392270669b91be5527d39c"
 		},
 		{
 			"ImportPath": "golang.org/x/net/netutil",
diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go
index ff2534e518f3e371fda0c96c0b23b53acfebbf0d..e6d572ab693c61ada3ff4f8615e8bbbb1a265bfe 100644
--- a/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go
+++ b/Godeps/_workspace/src/github.com/tendermint/tendermint/types/tx.go
@@ -4,9 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
-
 	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/ripemd160"
-
 	acm "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/account"
 	. "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/common"
 	ptypes "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box.go b/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box.go
index 05868b65ca1572d12c1dde0a9301ec795a12ea58..a940f516926f7d99847410cec8a582d5e0d3da1c 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box.go
@@ -18,9 +18,9 @@ This package is interoperable with NaCl: http://nacl.cr.yp.to/box.html.
 package box
 
 import (
-	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/curve25519"
-	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox"
-	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/salsa20/salsa"
+	"github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/curve25519"
+	"github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox"
+	"github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/salsa20/salsa"
 	"io"
 )
 
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box_test.go b/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box_test.go
index dbae504ecf475d63ca29a46ec0a8b50b67b9b07c..5d48f3b0a65d7d84c2b8fcceb36c48d04ac96482 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box_test.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/nacl/box/box_test.go
@@ -10,7 +10,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/curve25519"
+	"github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/curve25519"
 )
 
 func TestSealOpen(t *testing.T) {
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox/secretbox.go b/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox/secretbox.go
index 800cc5b5ccfb91a7cbeb974e7d53b5c880e49ae0..fc4a6f5b7d0dae013624b5b870cb3ff67d273e7c 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox/secretbox.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/nacl/secretbox/secretbox.go
@@ -18,8 +18,8 @@ This package is interoperable with NaCl: http://nacl.cr.yp.to/secretbox.html.
 package secretbox
 
 import (
-	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/poly1305"
-	"github.com/eris-ltd/eris-db/Godeps/_workspace/src/golang.org/x/crypto/salsa20/salsa"
+	"github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/poly1305"
+	"github.com/tendermint/tendermint/Godeps/_workspace/src/golang.org/x/crypto/salsa20/salsa"
 )
 
 // Overhead is the number of bytes of overhead when boxing a message.