diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 0000000000..6176499b08
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,456 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/bgentry/speakeasy"
+  packages = ["."]
+  revision = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd"
+  version = "v0.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/btcsuite/btcd"
+  packages = ["btcec"]
+  revision = "2be2f12b358dc57d70b8f501b00be450192efbc3"
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/ebuchman/fail-test"
+  packages = ["."]
+  revision = "95f809107225be108efcf10a3509e4ea6ceef3c4"
+
+[[projects]]
+  name = "github.com/fsnotify/fsnotify"
+  packages = ["."]
+  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+  version = "v1.4.7"
+
+[[projects]]
+  name = "github.com/go-kit/kit"
+  packages = [
+    "log",
+    "log/level",
+    "log/term"
+  ]
+  revision = "4dc7be5d2d12881735283bcab7352178e190fc71"
+  version = "v0.6.0"
+
+[[projects]]
+  name = "github.com/go-logfmt/logfmt"
+  packages = ["."]
+  revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "github.com/go-stack/stack"
+  packages = ["."]
+  revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"
+  version = "v1.7.0"
+
+[[projects]]
+  name = "github.com/gogo/protobuf"
+  packages = [
+    "gogoproto",
+    "jsonpb",
+    "proto",
+    "protoc-gen-gogo/descriptor",
+    "sortkeys",
+    "types"
+  ]
+  revision = "1adfc126b41513cc696b209667c8656ea7aac67c"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/golang/protobuf"
+  packages = [
+    "proto",
+    "ptypes",
+    "ptypes/any",
+    "ptypes/duration",
+    "ptypes/timestamp"
+  ]
+  revision = "925541529c1fa6821df4e44ce2723319eb2be768"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golang/snappy"
+  packages = ["."]
+  revision = "553a641470496b2327abcac10b36396bd98e45c9"
+
+[[projects]]
+  name = "github.com/gorilla/websocket"
+  packages = ["."]
+  revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
+  version = "v1.2.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/hcl"
+  packages = [
+    ".",
+    "hcl/ast",
+    "hcl/parser",
+    "hcl/scanner",
+    "hcl/strconv",
+    "hcl/token",
+    "json/parser",
+    "json/scanner",
+    "json/token"
+  ]
+  revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/howeyc/crc16"
+  packages = ["."]
+  revision = "2b2a61e366a66d3efb279e46176e7291001e0354"
+
+[[projects]]
+  name = "github.com/inconshreveable/mousetrap"
+  packages = ["."]
+  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+  version = "v1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/jmhodges/levigo"
+  packages = ["."]
+  revision = "c42d9e0ca023e2198120196f842701bb4c55d7b9"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kr/logfmt"
+  packages = ["."]
+  revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
+
+[[projects]]
+  name = "github.com/magiconair/properties"
+  packages = ["."]
+  revision = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6"
+  version = "v1.7.6"
+
+[[projects]]
+  name = "github.com/mattn/go-isatty"
+  packages = ["."]
+  revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
+  version = "v0.0.3"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mitchellh/mapstructure"
+  packages = ["."]
+  revision = "00c29f56e2386353d58c599509e8dc3801b0d716"
+
+[[projects]]
+  name = "github.com/pelletier/go-toml"
+  packages = ["."]
+  revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/rcrowley/go-metrics"
+  packages = ["."]
+  revision = "8732c616f52954686704c8645fe1a9d59e9df7c1"
+
+[[projects]]
+  name = "github.com/spf13/afero"
+  packages = [
+    ".",
+    "mem"
+  ]
+  revision = "bb8f1927f2a9d3ab41c9340aa034f6b803f4359c"
+  version = "v1.0.2"
+
+[[projects]]
+  name = "github.com/spf13/cast"
+  packages = ["."]
+  revision = "8965335b8c7107321228e3e3702cab9832751bac"
+  version = "v1.2.0"
+
+[[projects]]
+  name = "github.com/spf13/cobra"
+  packages = ["."]
+  revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+  version = "v0.0.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/spf13/jwalterweatherman"
+  packages = ["."]
+  revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
+
+[[projects]]
+  name = "github.com/spf13/pflag"
+  packages = ["."]
+  revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/spf13/viper"
+  packages = ["."]
+  revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/stretchr/testify"
+  packages = [
+    "assert",
+    "require"
+  ]
+  revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71"
+  version = "v1.2.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/syndtr/goleveldb"
+  packages = [
+    "leveldb",
+    "leveldb/cache",
+    "leveldb/comparer",
+    "leveldb/errors",
+    "leveldb/filter",
+    "leveldb/iterator",
+    "leveldb/journal",
+    "leveldb/memdb",
+    "leveldb/opt",
+    "leveldb/storage",
+    "leveldb/table",
+    "leveldb/util"
+  ]
+  revision = "c7a14d4b00e222eab6111b4cd1af829c13f53ec2"
+
+[[projects]]
+  branch = "develop"
+  name = "github.com/tendermint/abci"
+  packages = [
+    "client",
+    "example/code",
+    "example/kvstore",
+    "server",
+    "types"
+  ]
+  revision = "d5361de3001184de7cd3a0ccbae12eccde3d724e"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/tendermint/ed25519"
+  packages = [
+    ".",
+    "edwards25519",
+    "extra25519"
+  ]
+  revision = "d8387025d2b9d158cf4efb07e7ebf814bcce2057"
+
+[[projects]]
+  name = "github.com/tendermint/go-crypto"
+  packages = [
+    ".",
+    "keys",
+    "keys/bcrypt",
+    "keys/words",
+    "keys/words/wordlist"
+  ]
+  revision = "c3e19f3ea26f5c3357e0bcbb799b0761ef923755"
+  version = "v0.5.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/tendermint/go-wire"
+  packages = [
+    ".",
+    "data"
+  ]
+  revision = "3bd40838076a5c18fe2092b9de022787698b24a3"
+
+[[projects]]
+  name = "github.com/tendermint/iavl"
+  packages = ["."]
+  revision = "669ff61054a14c4542dbd657ab438800d5630e45"
+  version = "v0.6.1"
+
+[[projects]]
+  branch = "develop"
+  name = "github.com/tendermint/tendermint"
+  packages = [
+    "blockchain",
+    "cmd/tendermint/commands",
+    "config",
+    "consensus",
+    "consensus/types",
+    "evidence",
+    "lite",
+    "lite/client",
+    "lite/errors",
+    "lite/files",
+    "lite/proxy",
+    "mempool",
+    "node",
+    "p2p",
+    "p2p/conn",
+    "p2p/pex",
+    "p2p/trust",
+    "p2p/upnp",
+    "proxy",
+    "rpc/client",
+    "rpc/core",
+    "rpc/core/types",
+    "rpc/grpc",
+    "rpc/lib",
+    "rpc/lib/client",
+    "rpc/lib/server",
+    "rpc/lib/types",
+    "state",
+    "state/txindex",
+    "state/txindex/kv",
+    "state/txindex/null",
+    "types",
+    "types/priv_validator",
+    "version",
+    "wire"
+  ]
+  revision = "6120a4c5e4f4b0ea9d5f22cedee949b862b11a5e"
+
+[[projects]]
+  branch = "develop"
+  name = "github.com/tendermint/tmlibs"
+  packages = [
+    "autofile",
+    "cli",
+    "cli/flags",
+    "clist",
+    "common",
+    "db",
+    "flowrate",
+    "log",
+    "merkle",
+    "pubsub",
+    "pubsub/query"
+  ]
+  revision = "26f2ab65f82cfc6873c312e8030104c47c05f10e"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = [
+    "blowfish",
+    "curve25519",
+    "nacl/box",
+    "nacl/secretbox",
+    "openpgp/armor",
+    "openpgp/errors",
+    "poly1305",
+    "ripemd160",
+    "salsa20/salsa"
+  ]
+  revision = "91a49db82a88618983a78a06c1cbd4e00ab749ab"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = [
+    "context",
+    "http2",
+    "http2/hpack",
+    "idna",
+    "internal/timeseries",
+    "lex/httplex",
+    "netutil",
+    "trace"
+  ]
+  revision = "22ae77b79946ea320088417e4d50825671d82d57"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix"]
+  revision = "dd2ff4accc098aceecb86b36eaa7829b2a17b1c9"
+
+[[projects]]
+  name = "golang.org/x/text"
+  packages = [
+    "collate",
+    "collate/build",
+    "internal/colltab",
+    "internal/gen",
+    "internal/tag",
+    "internal/triegen",
+    "internal/ucd",
+    "language",
+    "secure/bidirule",
+    "transform",
+    "unicode/bidi",
+    "unicode/cldr",
+    "unicode/norm",
+    "unicode/rangetable"
+  ]
+  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
+  version = "v0.3.0"
+
+[[projects]]
+  branch = "master"
+  name = "google.golang.org/genproto"
+  packages = ["googleapis/rpc/status"]
+  revision = "2c5e7ac708aaa719366570dd82bda44541ca2a63"
+
+[[projects]]
+  name = "google.golang.org/grpc"
+  packages = [
+    ".",
+    "balancer",
+    "balancer/base",
+    "balancer/roundrobin",
+    "codes",
+    "connectivity",
+    "credentials",
+    "encoding",
+    "encoding/proto",
+    "grpclb/grpc_lb_v1/messages",
+    "grpclog",
+    "internal",
+    "keepalive",
+    "metadata",
+    "naming",
+    "peer",
+    "resolver",
+    "resolver/dns",
+    "resolver/passthrough",
+    "stats",
+    "status",
+    "tap",
+    "transport"
+  ]
+  revision = "8e4536a86ab602859c20df5ebfd0bd4228d08655"
+  version = "v1.10.0"
+
+[[projects]]
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5"
+  version = "v2.1.1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "75e68c7011e72105ad6c3899566307c831432a0dc32c6b21e650946c65a40c08"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000000..abb5df54d9
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,87 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/bgentry/speakeasy"
+  version = "0.1.0"
+
+[[constraint]]
+  name = "github.com/golang/protobuf"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/mattn/go-isatty"
+  version = "0.0.3"
+
+[[constraint]]
+  name = "github.com/pkg/errors"
+  version = "0.8.0"
+
+# [[constraint]]
+#   branch = "master"
+#   name = "github.com/rigelrozanski/common"
+
+[[constraint]]
+  name = "github.com/spf13/cobra"
+  version = "0.0.1"
+
+[[constraint]]
+  name = "github.com/spf13/viper"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "1.2.1"
+
+[[constraint]]
+  branch = "develop"
+  name = "github.com/tendermint/abci"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/tendermint/go-crypto"
+
+[[override]]
+  branch = "master"
+  name = "github.com/tendermint/go-wire"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/tendermint/iavl"
+
+[[constraint]]
+  branch = "develop"
+  name = "github.com/tendermint/tendermint"
+
+[[override]]
+  branch = "develop"
+  name = "github.com/tendermint/tmlibs"
+
+[prune]
+  go-tests = true
+  unused-packages = true
+
diff --git a/Makefile b/Makefile
index 395af306ac..dd8c1b748d 100644
--- a/Makefile
+++ b/Makefile
@@ -29,18 +29,18 @@ dist:
 ### Tools & dependencies
 
 check_tools:
-	cd tools && $(MAKE) check
+	cd tools && $(MAKE) check_tools
 
 update_tools:
-	cd tools && $(MAKE) glide_update
+	cd tools && $(MAKE) update_tools
 
 get_tools:
-	cd tools && $(MAKE)
+	cd tools && $(MAKE) get_tools
 
 get_vendor_deps:
 	@rm -rf vendor/
-	@echo "--> Running glide install"
-	@glide install
+	@echo "--> Running dep ensure"
+	@dep ensure -v
 
 draw_deps:
 	@# requires brew install graphviz or apt-get install graphviz
diff --git a/client/rpc/block.go b/client/rpc/block.go
index c701061a20..9519187891 100644
--- a/client/rpc/block.go
+++ b/client/rpc/block.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
+	wire "github.com/tendermint/go-wire"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	tmwire "github.com/tendermint/tendermint/wire"
 )
 
 const (
@@ -56,7 +56,7 @@ func getBlock(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	output, err := tmwire.MarshalJSON(res)
+	output, err := wire.MarshalJSON(res)
 	// output, err := json.MarshalIndent(res, "  ", "")
 	if err != nil {
 		return err
diff --git a/client/rpc/status.go b/client/rpc/status.go
index c5888d99f5..4ca6e9084c 100644
--- a/client/rpc/status.go
+++ b/client/rpc/status.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+	wire "github.com/tendermint/go-wire"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	tmwire "github.com/tendermint/tendermint/wire"
 )
 
 func statusCommand() *cobra.Command {
@@ -30,7 +30,7 @@ func checkStatus(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	output, err := tmwire.MarshalJSON(res)
+	output, err := wire.MarshalJSON(res)
 	// output, err := json.MarshalIndent(res, "  ", "")
 	if err != nil {
 		return err
diff --git a/client/rpc/validators.go b/client/rpc/validators.go
index 8eebda8dd6..94ec4226e1 100644
--- a/client/rpc/validators.go
+++ b/client/rpc/validators.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
+	wire "github.com/tendermint/go-wire"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	tmwire "github.com/tendermint/tendermint/wire"
 )
 
 func validatorCommand() *cobra.Command {
@@ -47,7 +47,7 @@ func getValidators(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	output, err := tmwire.MarshalJSON(res)
+	output, err := wire.MarshalJSON(res)
 	// output, err := json.MarshalIndent(res, "  ", "")
 	if err != nil {
 		return err
diff --git a/docs/sdk/install.rst b/docs/sdk/install.rst
index 4857f63e79..c5a82475a3 100644
--- a/docs/sdk/install.rst
+++ b/docs/sdk/install.rst
@@ -13,7 +13,7 @@ Usually, Cosmos SDK can be installed like a normal Go program:
     go get -u github.com/cosmos/cosmos-sdk
 
 If the dependencies have been updated with breaking changes, or if
-another branch is required, ``glide`` is used for dependency management.
+another branch is required, ``dep`` is used for dependency management.
 Thus, assuming you've already run ``go get`` or otherwise cloned the
 repo, the correct way to install is:
 
@@ -24,12 +24,12 @@ repo, the correct way to install is:
     make all
 
 This will create the ``basecoin`` binary in ``$GOPATH/bin``.
-``make all`` implies ``make get_vendor_deps`` and uses ``glide`` to
+``make all`` implies ``make get_vendor_deps`` and uses ``dep`` to
 install the correct version of all dependencies. It also tests the code,
 including some cli tests to make sure your binary behaves properly.
 
 If you need another branch, make sure to run ``git checkout <branch>``
 before ``make all``. And if you switch branches a lot, especially
 touching other tendermint repos, you may need to ``make fresh``
-sometimes so glide doesn't get confused with all the branches and
+sometimes so dep doesn't get confused with all the branches and
 versions lying around.
diff --git a/docs/sdk/overview.rst b/docs/sdk/overview.rst
index 3342561e0e..bf7b23a606 100644
--- a/docs/sdk/overview.rst
+++ b/docs/sdk/overview.rst
@@ -56,7 +56,7 @@ Strictly speaking, Golang does not implement object capabilities completely, bec
 * pervasive ability to override module vars https://github.com/golang/go/issues/23161
 * data-race vulnerability where 2+ goroutines can create illegal interface values
 
-The first is easy to catch by auditing imports and using a proper dependency version control system like Glide.  The second and third are unfortunate but it can be audited with some cost.
+The first is easy to catch by auditing imports and using a proper dependency version control system like Dep.  The second and third are unfortunate but it can be audited with some cost.
 
 Perhaps `Go2 will implement the object capability model <https://github.com/golang/go/issues/23157>`__.
 
diff --git a/examples/basecoin/Makefile b/examples/basecoin/Makefile
index dac7dd213d..e0cf14caa6 100644
--- a/examples/basecoin/Makefile
+++ b/examples/basecoin/Makefile
@@ -1,11 +1,18 @@
 PACKAGES=$(shell go list ./... | grep -v '/vendor/')
 BUILD_FLAGS = -ldflags "-X github.com/cosmos/cosmos-sdk/examples/basecoin/version.GitCommit=`git rev-parse --short HEAD`"
 
-all: build test
+all: get_tools get_vendor_deps build test
+
+get_tools:
+	go get github.com/golang/dep/cmd/dep
 
 build:
 	go build $(BUILD_FLAGS) -o build/basecoin ./cmd/...
 
+get_vendor_deps:
+	@rm -rf vendor/
+	@dep ensure
+
 test:
 	@go test $(PACKAGES)
 
diff --git a/glide.lock b/glide.lock
deleted file mode 100644
index 413737d23a..0000000000
--- a/glide.lock
+++ /dev/null
@@ -1,263 +0,0 @@
-hash: bff8e6213ad8494602f2095adde9bdbab0fd891345675920175cf05c65702e07
-updated: 2018-03-02T12:01:38.719098766-05:00
-imports:
-- name: github.com/bgentry/speakeasy
-  version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
-- name: github.com/btcsuite/btcd
-  version: 2be2f12b358dc57d70b8f501b00be450192efbc3
-  subpackages:
-  - btcec
-- name: github.com/ebuchman/fail-test
-  version: 95f809107225be108efcf10a3509e4ea6ceef3c4
-- name: github.com/fsnotify/fsnotify
-  version: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
-- name: github.com/go-kit/kit
-  version: 4dc7be5d2d12881735283bcab7352178e190fc71
-  subpackages:
-  - log
-  - log/level
-  - log/term
-- name: github.com/go-logfmt/logfmt
-  version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
-- name: github.com/go-stack/stack
-  version: 259ab82a6cad3992b4e21ff5cac294ccb06474bc
-- name: github.com/gogo/protobuf
-  version: 1adfc126b41513cc696b209667c8656ea7aac67c
-  subpackages:
-  - gogoproto
-  - jsonpb
-  - proto
-  - protoc-gen-gogo/descriptor
-  - sortkeys
-  - types
-- name: github.com/golang/protobuf
-  version: 925541529c1fa6821df4e44ce2723319eb2be768
-  subpackages:
-  - proto
-  - ptypes
-  - ptypes/any
-  - ptypes/duration
-  - ptypes/timestamp
-- name: github.com/golang/snappy
-  version: 553a641470496b2327abcac10b36396bd98e45c9
-- name: github.com/gorilla/websocket
-  version: 0647012449a1878977514a346b26637dd022446c
-- name: github.com/hashicorp/hcl
-  version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8
-  subpackages:
-  - hcl/ast
-  - hcl/parser
-  - hcl/scanner
-  - hcl/strconv
-  - hcl/token
-  - json/parser
-  - json/scanner
-  - json/token
-- name: github.com/howeyc/crc16
-  version: 2b2a61e366a66d3efb279e46176e7291001e0354
-- name: github.com/inconshreveable/mousetrap
-  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-- name: github.com/jmhodges/levigo
-  version: c42d9e0ca023e2198120196f842701bb4c55d7b9
-- name: github.com/kr/logfmt
-  version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
-- name: github.com/magiconair/properties
-  version: 2c9e9502788518c97fe44e8955cd069417ee89df
-- name: github.com/mattn/go-isatty
-  version: 0360b2af4f38e8d38c7fce2a9f4e702702d73a39
-- name: github.com/mitchellh/mapstructure
-  version: 00c29f56e2386353d58c599509e8dc3801b0d716
-- name: github.com/pelletier/go-toml
-  version: 05bcc0fb0d3e60da4b8dd5bd7e0ea563eb4ca943
-- name: github.com/pkg/errors
-  version: 645ef00459ed84a119197bfb8d8205042c6df63d
-- name: github.com/rcrowley/go-metrics
-  version: 8732c616f52954686704c8645fe1a9d59e9df7c1
-- name: github.com/rigelrozanski/common
-  version: f691f115798593d783b9999b1263c2f4ffecc439
-- name: github.com/spf13/afero
-  version: bbf41cb36dffe15dff5bf7e18c447801e7ffe163
-  subpackages:
-  - mem
-- name: github.com/spf13/cast
-  version: 8965335b8c7107321228e3e3702cab9832751bac
-- name: github.com/spf13/cobra
-  version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b
-- name: github.com/spf13/jwalterweatherman
-  version: 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394
-- name: github.com/spf13/pflag
-  version: e57e3eeb33f795204c1ca35f56c44f83227c6e66
-- name: github.com/spf13/viper
-  version: 25b30aa063fc18e48662b86996252eabdcf2f0c7
-- name: github.com/syndtr/goleveldb
-  version: c7a14d4b00e222eab6111b4cd1af829c13f53ec2
-  subpackages:
-  - leveldb
-  - leveldb/cache
-  - leveldb/comparer
-  - leveldb/errors
-  - leveldb/filter
-  - leveldb/iterator
-  - leveldb/journal
-  - leveldb/memdb
-  - leveldb/opt
-  - leveldb/storage
-  - leveldb/table
-  - leveldb/util
-- name: github.com/tendermint/abci
-  version: 9e0e00bef42aebf6b402f66bf0f3dc607de8a6f3
-  subpackages:
-  - client
-  - example/code
-  - example/kvstore
-  - server
-  - types
-- name: github.com/tendermint/ed25519
-  version: d8387025d2b9d158cf4efb07e7ebf814bcce2057
-  subpackages:
-  - edwards25519
-  - extra25519
-- name: github.com/tendermint/go-crypto
-  version: c3e19f3ea26f5c3357e0bcbb799b0761ef923755
-  subpackages:
-  - keys
-  - keys/bcrypt
-  - keys/words
-  - keys/words/wordlist
-- name: github.com/tendermint/go-wire
-  version: fa721242b042ecd4c6ed1a934ee740db4f74e45c
-  subpackages:
-  - data
-- name: github.com/tendermint/iavl
-  version: 669ff61054a14c4542dbd657ab438800d5630e45
-- name: github.com/tendermint/tendermint
-  version: 3cedd8cf070ef120964ac99367cd69414665604b
-  subpackages:
-  - blockchain
-  - cmd/tendermint/commands
-  - config
-  - consensus
-  - consensus/types
-  - evidence
-  - lite
-  - lite/client
-  - lite/errors
-  - lite/files
-  - lite/proxy
-  - mempool
-  - node
-  - p2p
-  - p2p/conn
-  - p2p/pex
-  - p2p/trust
-  - p2p/upnp
-  - proxy
-  - rpc/client
-  - rpc/core
-  - rpc/core/types
-  - rpc/grpc
-  - rpc/lib
-  - rpc/lib/client
-  - rpc/lib/server
-  - rpc/lib/types
-  - state
-  - state/txindex
-  - state/txindex/kv
-  - state/txindex/null
-  - types
-  - types/priv_validator
-  - version
-  - wire
-- name: github.com/tendermint/tmlibs
-  version: 26f2ab65f82cfc6873c312e8030104c47c05f10e
-  subpackages:
-  - autofile
-  - cli
-  - cli/flags
-  - clist
-  - common
-  - db
-  - flowrate
-  - log
-  - merkle
-  - pubsub
-  - pubsub/query
-- name: golang.org/x/crypto
-  version: 91a49db82a88618983a78a06c1cbd4e00ab749ab
-  subpackages:
-  - blowfish
-  - curve25519
-  - nacl/box
-  - nacl/secretbox
-  - openpgp/armor
-  - openpgp/errors
-  - poly1305
-  - ripemd160
-  - salsa20/salsa
-- name: golang.org/x/net
-  version: 22ae77b79946ea320088417e4d50825671d82d57
-  subpackages:
-  - context
-  - http2
-  - http2/hpack
-  - idna
-  - internal/timeseries
-  - lex/httplex
-  - netutil
-  - trace
-- name: golang.org/x/sys
-  version: dd2ff4accc098aceecb86b36eaa7829b2a17b1c9
-  subpackages:
-  - unix
-- name: golang.org/x/text
-  version: 0b0b1f509072617b86d90971b51da23cc52694f2
-  subpackages:
-  - secure/bidirule
-  - transform
-  - unicode/bidi
-  - unicode/norm
-- name: google.golang.org/genproto
-  version: 2c5e7ac708aaa719366570dd82bda44541ca2a63
-  subpackages:
-  - googleapis/rpc/status
-- name: google.golang.org/grpc
-  version: f0a1202acdc5c4702be05098d5ff8e9b3b444442
-  subpackages:
-  - balancer
-  - balancer/base
-  - balancer/roundrobin
-  - codes
-  - connectivity
-  - credentials
-  - encoding
-  - encoding/proto
-  - grpclb/grpc_lb_v1/messages
-  - grpclog
-  - internal
-  - keepalive
-  - metadata
-  - naming
-  - peer
-  - resolver
-  - resolver/dns
-  - resolver/passthrough
-  - stats
-  - status
-  - tap
-  - transport
-- name: gopkg.in/yaml.v2
-  version: 7f97868eec74b32b0982dd158a51a446d1da7eb5
-testImports:
-- name: github.com/davecgh/go-spew
-  version: 8991bc29aa16c548c550c7ff78260e27b9ab7c73
-  subpackages:
-  - spew
-- name: github.com/pmezard/go-difflib
-  version: 792786c7400a136282c1664665ae0a8db921c6c2
-  subpackages:
-  - difflib
-- name: github.com/stretchr/testify
-  version: 12b6f73e6084dad08a7c6e575284b177ecafbc71
-  subpackages:
-  - assert
-  - require
diff --git a/glide.yaml b/glide.yaml
deleted file mode 100644
index 5752ee12de..0000000000
--- a/glide.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-package: github.com/cosmos/cosmos-sdk
-import:
-- package: github.com/golang/protobuf
-  version: ^1.0.0
-  subpackages:
-  - proto
-- package: github.com/bgentry/speakeasy
-  version: ^0.1.0
-- package: github.com/mattn/go-isatty
-  version: ~0.0.3
-- package: github.com/pkg/errors
-  version: ^0.8.0
-- package: github.com/rigelrozanski/common
-- package: github.com/tendermint/abci
-  version: develop
-  subpackages:
-  - server
-  - types
-- package: github.com/tendermint/go-crypto
-  version: v0.5.0
-- package: github.com/tendermint/go-wire
-  version: v0.7.3
-- package: github.com/tendermint/iavl
-  version: v0.6.1
-- package: github.com/tendermint/tmlibs
-  version: develop
-  subpackages:
-  - common
-  - db
-  - log
-  - merkle
-- package: github.com/tendermint/tendermint
-  version: develop
-  subpackages:
-  - cmd/tendermint/commands
-  - config
-  - lite
-  - rpc/client
-  - types
-- package: golang.org/x/crypto
-  subpackages:
-  - ripemd160
-- package: github.com/spf13/pflag
-  version: v1.0.0
-- package: github.com/spf13/cobra
-  version: v0.0.1
-- package: github.com/spf13/viper
-  version: ^1.0.0
-testImport:
-- package: github.com/stretchr/testify
-  version: ^1.2.1
-  subpackages:
-  - assert
-  - require
diff --git a/tools/Gopkg.lock b/tools/Gopkg.lock
new file mode 100644
index 0000000000..92fe1e260c
--- /dev/null
+++ b/tools/Gopkg.lock
@@ -0,0 +1,56 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "github.com/alecthomas/gometalinter"
+  packages = ["."]
+  revision = "46cc1ea3778b247666c2949669a3333c532fa9c6"
+  version = "v2.0.5"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alecthomas/units"
+  packages = ["."]
+  revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/google/shlex"
+  packages = ["."]
+  revision = "6f45313302b9c56850fc17f99e40caebce98c716"
+
+[[projects]]
+  name = "github.com/nicksnyder/go-i18n"
+  packages = [
+    "i18n",
+    "i18n/bundle",
+    "i18n/language",
+    "i18n/translation"
+  ]
+  revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
+  version = "v1.10.0"
+
+[[projects]]
+  name = "github.com/pelletier/go-toml"
+  packages = ["."]
+  revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "v3-unstable"
+  name = "gopkg.in/alecthomas/kingpin.v3-unstable"
+  packages = ["."]
+  revision = "b8d601de6db1f3b56a99ffe9051eb708574bc1cd"
+
+[[projects]]
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5"
+  version = "v2.1.1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "bb8cda576a5c4dda202435f43a46ae50a254181a4bf22c6af6f4d3d03079d509"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/tools/Gopkg.toml b/tools/Gopkg.toml
new file mode 100644
index 0000000000..97fb629752
--- /dev/null
+++ b/tools/Gopkg.toml
@@ -0,0 +1,34 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+[[constraint]]
+  name = "github.com/alecthomas/gometalinter"
+  version = "2.0.5"
+
+[prune]
+  go-tests = true
+  unused-packages = true
+
diff --git a/tools/Makefile b/tools/Makefile
index 6786575cdc..cf4557f430 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,40 +1,40 @@
-all: install_glide check get_vendor_deps install
+all: install
 
 
 ########################################
-### Glide
+### DEP
 
-GLIDE = github.com/tendermint/glide
-GLIDE_CHECK := $(shell command -v glide 2> /dev/null)
+DEP = github.com/golang/dep/cmd/dep
+DEP_CHECK := $(shell command -v dep 2> /dev/null)
 
-check:
-ifndef GLIDE_CHECK
-	@echo "No glide in path.  Install with 'make install_glide'."
+check_tools:
+ifndef DEP_CHECK
+	@echo "No dep in path.  Install with 'make get_tools'."
 else
-	@echo "Found glide in path."
+	@echo "Found dep in path."
 endif
 
-install_glide:
-ifdef GLIDE_CHECK
-	@echo "Glide is already installed.  Run 'make update_glide' to update."
+get_tools:
+ifdef DEP_CHECK
+	@echo "Dep is already installed.  Run 'make update_tools' to update."
 else
-	@echo "$(ansi_grn)Installing glide$(ansi_end)"
-	go get -v $(GLIDE)
+	@echo "$(ansi_grn)Installing dep$(ansi_end)"
+	go get -v $(DEP)
 endif
 
-update_glide:
-	@echo "$(ansi_grn)Updating glide$(ansi_end)"
-	go get -u -v $(GLIDE)
+update_tools:
+	@echo "$(ansi_grn)Updating dep$(ansi_end)"
+	go get -u -v $(DEP)
 
 
 ########################################
 ### Install tools
 
 
-get_vendor_deps: check
+get_vendor_deps: check_tools
 	@rm -rf vendor/
-	@echo "--> Running glide install"
-	@glide install
+	@echo "--> Running dep ensure"
+	@dep ensure -v
 
 install: get_vendor_deps
 	@echo "$(ansi_grn)Installing tools$(ansi_end)"
@@ -44,9 +44,6 @@ install: get_vendor_deps
 	@echo "$(ansi_yel)Install gometalinter.v2$(ansi_end)"
 	GOBIN=$(CURDIR)/bin ./bin/go-vendorinstall github.com/alecthomas/gometalinter
 
-	@echo "$(ansi_yel)Install shelldown$(ansi_end)"
-	GOBIN=$(CURDIR)/bin ./bin/go-vendorinstall github.com/rigelrozanski/shelldown/cmd/shelldown
-
 	@echo "$(ansi_grn)Done installing tools$(ansi_end)"
 
 
@@ -62,4 +59,4 @@ ansi_end=\033[0m
 # To avoid unintended conflicts with file names, always add to .PHONY
 # unless there is a reason not to.
 # https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html
-.PHONY: check install_glide update_glide get_vendor_deps install
+.PHONY: check_tools install_tools update_tools get_vendor_deps install
diff --git a/tools/glide.lock b/tools/glide.lock
deleted file mode 100644
index f4af28eecc..0000000000
--- a/tools/glide.lock
+++ /dev/null
@@ -1,18 +0,0 @@
-hash: 934ad5be72c9c240e8555eb6e1b2319840266c04c0fa9e024008cf841c0cee65
-updated: 2018-02-23T19:33:08.596187+01:00
-imports:
-- name: github.com/alecthomas/gometalinter
-  version: 46cc1ea3778b247666c2949669a3333c532fa9c6
-- name: github.com/rigelrozanski/common
-  version: f691f115798593d783b9999b1263c2f4ffecc439
-- name: github.com/rigelrozanski/shelldown
-  version: 2e18b6eb9bf428aa524e71433296e0b7c73ae0a3
-  subpackages:
-  - cmd/shelldown
-- name: github.com/spf13/cobra
-  version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b
-- name: github.com/spf13/pflag
-  version: e57e3eeb33f795204c1ca35f56c44f83227c6e66
-- name: github.com/spf13/viper
-  version: 25b30aa063fc18e48662b86996252eabdcf2f0c7
-testImports: []
diff --git a/tools/glide.yaml b/tools/glide.yaml
deleted file mode 100644
index 6ddd6443da..0000000000
--- a/tools/glide.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-package: github.com/cosmos/cosmos-sdk/tools
-import:
-- package: github.com/alecthomas/gometalinter
-  version: ^2.0.5
-- package: github.com/rigelrozanski/shelldown
-  subpackages:
-  - cmd/shelldown
-- package: github.com/spf13/pflag
-  version: v1.0.0
-- package: github.com/spf13/cobra
-  version: v0.0.1
-- package: github.com/spf13/viper
-  version: ^1.0.0
diff --git a/tools/main.go b/tools/main.go
index 7fd61d589d..104268010a 100644
--- a/tools/main.go
+++ b/tools/main.go
@@ -1,12 +1,11 @@
 package main
 
-import (
-	// Include dependencies here so glide picks them up
-	// and installs sub-dependencies.
+// Include dependencies here so dep picks them up
+// and installs sub-dependencies.
 
-	// TODO: Ideally this gets auto-imported on glide update.
-	// Any way to make that happen?
-	_ "github.com/rigelrozanski/common"
-)
+// TODO: Ideally this gets auto-imported on dep update.
+// Any way to make that happen?
+// NOTE: problems with this import because its a main not a lib
+// _ "github.com/alecthomas/gometalinter"
 
 func main() {}