diff --git a/glide.lock b/glide.lock
index 3e77b1bbc54585337fa5afd20b5cbb836ba9523b..8b8a2d21a9bd61ff79c67516a5eee413ca5947c4 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: 9cba3c71b5ea9762cc27faa683ad5611c47de7761f5633131b92cde7961eb227
-updated: 2016-05-11T16:58:37.071884134-04:00
+hash: 3cbc670949fad7c035e6afc0f72060a29d3f82e0ed75e698f0bb50b3b47009b2
+updated: 2016-05-17T10:49:40.457365687+01:00
 imports:
 - name: github.com/btcsuite/btcd
-  version: 2554caee5919958c0d4b41db8035f0e12ce6f624
+  version: f893558d782396f10c2fe49a8bc73deff4a36d14
   subpackages:
   - btcec
 - name: github.com/btcsuite/fastsha256
@@ -14,6 +14,8 @@ imports:
   subpackages:
   - binding
   - render
+- name: github.com/go-stack/stack
+  version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82
 - name: github.com/golang/protobuf
   version: 2402d76f3d41f928c7902a765dfc872356dd3aad
   subpackages:
@@ -22,15 +24,10 @@ imports:
   version: d7b1e156f50d3c4664f683603af70e3e47fa0aa2
 - name: github.com/gorilla/websocket
   version: 1f512fc3f05332ba7117626cdfb4e07474e58e60
-- name: github.com/inconshreveable/log15
-  version: 57a084d014d4150152b19e4e531399a7145d1540
-  subpackages:
-  - stack
-  - term
 - name: github.com/manucorporat/sse
   version: ee05b128a739a0fb76c7ebd3ae4810c1de808d6d
 - name: github.com/mattn/go-colorable
-  version: 45ce6a6f60010487dd0dbab368b5fbbed1c14ef0
+  version: e8a10ddc7d2a7fe255f6fd7f501070a4cb62c183
 - name: github.com/mattn/go-isatty
   version: 56b76bdf51f7708750eac80fa38b952bb9f32639
 - name: github.com/naoina/go-stringutil
@@ -68,7 +65,7 @@ imports:
 - name: github.com/tendermint/go-common
   version: dcfa46af1341d03b80d32e4901019d1668b978b9
 - name: github.com/tendermint/go-config
-  version: 2d53a767e86786e610f90171e455c98a9927ad60
+  version: cfcef384d64b94e50909596e39b32ffb3cc20573
 - name: github.com/tendermint/go-crypto
   version: 41cfb7b677f4e16cdfd22b6ce0946c89919fbc7b
 - name: github.com/tendermint/go-db
@@ -80,7 +77,7 @@ imports:
 - name: github.com/tendermint/go-merkle
   version: 05042c6ab9cad51d12e4cecf717ae68e3b1409a8
 - name: github.com/tendermint/go-p2p
-  version: 7d997ca8e658731a22de53f11efaedee0c764b8d
+  version: 5bd7692323ec60d6461678f09b5024a952164151
   subpackages:
   - upnp
 - name: github.com/tendermint/go-rpc
@@ -92,34 +89,36 @@ imports:
 - name: github.com/tendermint/go-wire
   version: 3b0adbc86ed8425eaed98516165b6788d9f4de7a
 - name: github.com/tendermint/log15
-  version: 6e460758f10ef42a4724b8e4a82fee59aaa0e41d
+  version: a36450f4378275a02e1259eb5a868879019bcd41
+  subpackages:
+  - term
 - name: github.com/tendermint/tendermint
-  version: b2e612fb79f204a5c8ebf63d9824b6119c42b84c
+  version: 55ef4b225fb0aa5637a96d36a8c0d030a59dc21d
   subpackages:
   - config/tendermint
-  - consensus
   - node
-  - rpc/core/types
-  - types
   - proxy
+  - types
+  - consensus
   - blockchain
   - mempool
   - config/tendermint_test
+  - rpc/core/types
   - rpc/core
   - state
   - version
 - name: github.com/tendermint/tmsp
   version: 7ffd2899092f47110a5ffebe20247a9b7f80f4ad
   subpackages:
+  - client
   - server
   - types
-  - client
   - example/dummy
   - example/nil
 - name: github.com/tommy351/gin-cors
   version: dc91dec6313ae4db53481bf3b29cf6b94bf80357
 - name: golang.org/x/crypto
-  version: b76c864ef1dca1d8f271f917c290cddcce3d9e0d
+  version: b6789ab629056511030d652d851e7dc10c9e9c9e
   subpackages:
   - ripemd160
   - nacl/secretbox
@@ -135,7 +134,7 @@ imports:
   - context
   - netutil
 - name: golang.org/x/sys
-  version: 806cb00533e5af545ce95e84b349404f8e5ff7a8
+  version: d4feaf1a7e61e1d9e79e6c4e76c6349e9cab0a03
   subpackages:
   - unix
 - name: gopkg.in/fatih/set.v0
diff --git a/glide.yaml b/glide.yaml
index 644e4c539c84a020de970cccc74f59b8f1a9654a..d9571650f126b7ee40e4feca0df6828d5866b6ac 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,32 +1,11 @@
 package: github.com/eris-ltd/eris-db
 import:
+- package: github.com/tendermint/tendermint
+  version: 55ef4b225fb0aa5637a96d36a8c0d030a59dc21d
 - package: github.com/gin-gonic/gin
 - package: github.com/gorilla/websocket
 - package: github.com/naoina/toml
-- package: github.com/tendermint/ed25519
-- 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-events
-- package: github.com/tendermint/go-logger
-- package: github.com/tendermint/go-merkle
-- package: github.com/tendermint/go-p2p
 - package: github.com/stretchr/testify
-- package: github.com/tendermint/go-rpc
-- package: github.com/tendermint/go-wire
-- package: github.com/tendermint/log15
-- package: github.com/tendermint/tendermint
-  subpackages:
-  - config/tendermint
-  - consensus
-  - node
-  - rpc/core/types
-  - types
-- package: github.com/tendermint/tmsp
-  subpackages:
-  - server
-  - types
 - package: github.com/tommy351/gin-cors
 - package: golang.org/x/crypto
   subpackages: