diff --git a/.gitignore b/.gitignore
index e526480e6..897b9a363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ rpc/test/.tendermint
 .tendermint
 remote_dump
 .revision
+vendor
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 000000000..6e588e2f5
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,70 @@
+hash: 2d07b63b255fce7a06beb977ecf72ee2aeddd7ad236f92a4e46dcafc90750426
+updated: 2016-01-05T13:08:20.335534917-08:00
+imports:
+- name: github.com/codegangsta/cli
+  version: c31a7975863e7810c92e2e288a9ab074f9a88f29
+- name: github.com/gogo/protobuf
+  version: b25331f05786694d634d632a8043fef600a84e62
+  subpackages:
+  - /proto
+- name: github.com/golang/protobuf
+  version: 04eac41517df87aa1adec44b1c032a027b546f05
+- name: github.com/golang/snappy
+  version: 723cc1e459b8eea2dea4583200fd60757d40097a
+- name: github.com/gorilla/websocket
+  version: 3986be78bf859e01f01af631ad76da5b269d270c
+- name: github.com/inconshreveable/log15
+  version: 210d6fdc4d979ef6579778f1b6ed84571454abb4
+- name: github.com/mattn/go-colorable
+  version: 3dac7b4f76f6e17fb39b768b89e3783d16e237fe
+- name: github.com/naoina/go-stringutil
+  version: 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
+- name: github.com/naoina/toml
+  version: 751171607256bb66e64c9f0220c00662420c38e9
+- name: github.com/onsi/ginkgo
+  version: e43390e35a4a88f3f95d5ddf9055efb7a1170469
+  repo: https://github.com/onsi/ginkgo
+- name: github.com/onsi/gomega
+  version: 0fe204460da2c8fa1babcaac196e694de8f1aaa1
+  repo: https://github.com/onsi/gomega
+- name: github.com/sfreiberg/gotwilio
+  version: b7230c284bd0c1614c94d00b9998c49f9a2737d8
+- name: github.com/spf13/pflag
+  version: 7f60f83a2c81bc3c3c0d5297f61ddfa68da9d3b7
+- name: github.com/syndtr/goleveldb
+  version: 5acacf6e72d3aeaf26dd3d3f163c635d3ef1e6e6
+- name: github.com/tendermint/ed25519
+  version: fdac6641497281ed1cc368687ec6377e96e02b24
+- name: github.com/tendermint/flowcontrol
+  version: 84d9671090430e8ec80e35b339907e0579b999eb
+- name: github.com/tendermint/go-clist
+  version: 634527f5b60fd7c71ca811262493df2ad65ee0ca
+- name: github.com/tendermint/go-common
+  version: f592570310c9512c9bdc78335927ffb15fd58975
+- name: github.com/tendermint/go-config
+  version: 3b895c7ce4999ee6fff7b7ca6253f0b41d9bf85c
+- name: github.com/tendermint/go-crypto
+  version: ea56ed5ea24c2d6928be62d9921ff99643dfe8db
+- name: github.com/tendermint/go-db
+  version: 28d39f8726c76b163e881c3d05dad227c93200ae
+- name: github.com/tendermint/go-logger
+  version: 980f02a5001b46f02ab3fbb036531d4ea789d2bf
+- name: github.com/tendermint/go-merkle
+  version: 0df23fe1f8e5d82baeeea02e902b2d3abd6bece4
+- name: github.com/tendermint/go-p2p
+  version: 1f2c1d07600b9612a1f92f42a3c8c893eafd922c
+  subpackages:
+  - upnp
+- name: github.com/tendermint/go-wire
+  version: 009f9185cd906f7edd33334c6d9fcf1b938138e0
+- name: github.com/tendermint/log15
+  version: 6e460758f10ef42a4724b8e4a82fee59aaa0e41d
+- name: github.com/tendermint/tmsp
+  version: 1b7243a9909b86dc668f374fd68b17a405740bc4
+  subpackages:
+  - /types
+- name: golang.org/x/crypto
+  version: 552e9d568fde9701ea1944fb01c8aadaceaa7353
+  subpackages:
+  - /ripemd160
+devImports: []
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 000000000..53d8ac125
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,29 @@
+package: github.com/tendermint/tendermint
+import:
+- package: github.com/gogo/protobuf
+  subpackages:
+  - /proto
+- package: github.com/gorilla/websocket
+- package: github.com/naoina/toml
+- package: github.com/sfreiberg/gotwilio
+- package: github.com/spf13/pflag
+- package: github.com/tendermint/ed25519
+- package: github.com/tendermint/flowcontrol
+- package: github.com/tendermint/go-clist
+- package: github.com/tendermint/go-common
+- package: github.com/tendermint/go-config
+- package: github.com/tendermint/go-crypto
+- package: github.com/tendermint/go-db
+- package: github.com/tendermint/go-logger
+- package: github.com/tendermint/go-merkle
+- package: github.com/tendermint/go-p2p
+  subpackages:
+  - upnp
+- package: github.com/tendermint/go-wire
+- package: github.com/tendermint/log15
+- package: github.com/tendermint/tmsp
+  subpackages:
+  - /types
+- package: golang.org/x/crypto
+  subpackages:
+  - /ripemd160