diff --git a/armor.go b/armor.go
index 9343284e1..3d2eff5e7 100644
--- a/armor.go
+++ b/armor.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"io/ioutil"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	"golang.org/x/crypto/openpgp/armor"
 )
 
diff --git a/embed_test.go b/embed_test.go
index 6ebba893c..e2d2fe504 100644
--- a/embed_test.go
+++ b/embed_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	data "github.com/tendermint/go-data"
+	data "github.com/tendermint/go-wire/data"
 )
 
 type PubName struct {
diff --git a/encode_test.go b/encode_test.go
index c3380d435..6c5d03a1d 100644
--- a/encode_test.go
+++ b/encode_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	data "github.com/tendermint/go-data"
+	data "github.com/tendermint/go-wire/data"
 	wire "github.com/tendermint/go-wire"
 )
 
diff --git a/glide.yaml b/glide.yaml
index 4703d68c6..d5e0e2bbf 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -9,11 +9,10 @@ import:
 - package: github.com/tendermint/ed25519
   subpackages:
   - extra25519
-- package: github.com/tendermint/go-common
-- package: github.com/tendermint/go-data
-  version: develop
+- package: github.com/tendermint/tmlibs
+  version: unstable
 - package: github.com/tendermint/go-wire
-  version: develop
+  version: unstable
 - package: golang.org/x/crypto
   subpackages:
   - blowfish
diff --git a/priv_key.go b/priv_key.go
index efb85908c..85f8a8ec4 100644
--- a/priv_key.go
+++ b/priv_key.go
@@ -6,8 +6,8 @@ import (
 	secp256k1 "github.com/btcsuite/btcd/btcec"
 	"github.com/tendermint/ed25519"
 	"github.com/tendermint/ed25519/extra25519"
-	. "github.com/tendermint/go-common"
-	data "github.com/tendermint/go-data"
+	. "github.com/tendermint/tmlibs/common"
+	data "github.com/tendermint/go-wire/data"
 	"github.com/tendermint/go-wire"
 )
 
diff --git a/pub_key.go b/pub_key.go
index 4de7d59cd..99839f288 100644
--- a/pub_key.go
+++ b/pub_key.go
@@ -7,8 +7,8 @@ import (
 	secp256k1 "github.com/btcsuite/btcd/btcec"
 	"github.com/tendermint/ed25519"
 	"github.com/tendermint/ed25519/extra25519"
-	. "github.com/tendermint/go-common"
-	data "github.com/tendermint/go-data"
+	. "github.com/tendermint/tmlibs/common"
+	data "github.com/tendermint/go-wire/data"
 	"github.com/tendermint/go-wire"
 	"golang.org/x/crypto/ripemd160"
 )
diff --git a/random.go b/random.go
index edadeaab6..40cbcf8fa 100644
--- a/random.go
+++ b/random.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"sync"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 )
 
 var gRandInfo *randInfo
diff --git a/signature.go b/signature.go
index 5a165dc42..36451ed48 100644
--- a/signature.go
+++ b/signature.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"fmt"
 
-	. "github.com/tendermint/go-common"
-	data "github.com/tendermint/go-data"
+	. "github.com/tendermint/tmlibs/common"
+	data "github.com/tendermint/go-wire/data"
 	"github.com/tendermint/go-wire"
 )
 
diff --git a/signature_test.go b/signature_test.go
index 93aa17279..5e9f06723 100644
--- a/signature_test.go
+++ b/signature_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/ed25519"
-	data "github.com/tendermint/go-data"
+	data "github.com/tendermint/go-wire/data"
 )
 
 func TestSignAndValidateEd25519(t *testing.T) {
diff --git a/symmetric.go b/symmetric.go
index 36bddd44c..d4ac9b55b 100644
--- a/symmetric.go
+++ b/symmetric.go
@@ -3,7 +3,7 @@ package crypto
 import (
 	"errors"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	"golang.org/x/crypto/nacl/secretbox"
 )