diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
deleted file mode 100644
index 417c45b13..000000000
--- a/Godeps/Godeps.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"ImportPath": "github.com/pilosa/pilosa",
-	"GoVersion": "go1.7",
-	"GodepVersion": "v75",
-	"Packages": [
-		"./..."
-	],
-	"Deps": [
-		{
-			"ImportPath": "github.com/BurntSushi/toml",
-			"Comment": "v0.2.0-21-g9906417",
-			"Rev": "99064174e013895bbd9b025c31100bd1d9b590ca"
-		},
-		{
-			"ImportPath": "github.com/DataDog/datadog-go/statsd",
-			"Comment": "1.0.0",
-			"Rev": "909c02b65dd8a52e8fa6072db9752a112227cf21"
-		},
-		{
-			"ImportPath": "github.com/boltdb/bolt",
-			"Comment": "v1.3.0-29-g4b1ebc1",
-			"Rev": "4b1ebc1869ad66568b313d0dc410e2be72670dda"
-		},
-		{
-			"ImportPath": "github.com/davecgh/go-spew/spew",
-			"Comment": "v1.0.0-9-g346938d",
-			"Rev": "346938d642f2ec3594ed81d874461961cd0faa76"
-		},
-		{
-			"ImportPath": "github.com/gogo/protobuf/proto",
-			"Comment": "v0.3-123-ga9cd0c3",
-			"Rev": "a9cd0c35b97daf74d0ebf3514c5254814b2703b4"
-		},
-		{
-			"ImportPath": "github.com/golang/groupcache/lru",
-			"Rev": "a6b377e3400b08991b80d6805d627f347f983866"
-		},
-		{
-			"ImportPath": "golang.org/x/sys/unix",
-			"Rev": "c200b10b5d5e122be351b67af224adc6128af5bf"
-		}
-	]
-}
diff --git a/Godeps/Readme b/Godeps/Readme
deleted file mode 100644
index 4cdaa53d5..000000000
--- a/Godeps/Readme
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.
diff --git a/README-dev.md b/README-dev.md
index 958b03e20..c5fe72368 100644
--- a/README-dev.md
+++ b/README-dev.md
@@ -21,16 +21,12 @@ git clone git@github.com:${USER}/pilosa.git
 cd ${GOPATH}/src/github.com/pilosa/pilosa
 ```
 
-Install `godep` to manage dependencies:
-
-```sh
-go get -u github.com/tools/godep
-```
+Install [Glide][] to manage dependencies.
 
 Install Pilosa command line tools:
 
 ```sh
-go install github.com/pilosa/pilosa/...
+go install github.com/pilosa/pilosa/cmd/...
 ```
 
 Running `pilosa` should now run a Pilosa instance.
@@ -65,3 +61,5 @@ git push --set-upstream origin a-branch-for-the-task
 ```
 
 All left to do is creating a pull request on github.com.
+
+[Glide]: http://glide.sh/
diff --git a/README.md b/README.md
index ec39dfcd0..cdd71912f 100644
--- a/README.md
+++ b/README.md
@@ -197,16 +197,12 @@ Returns the top 20 Bitmaps from `bar`in attribute `category` with values `81 or
 
 ### Updating dependencies
 
-To update dependencies, you'll need to install [godep][]:
+To update dependencies, you'll need to install [Glide][].
+
+Then add the new dependencies in your project:
 
 ```sh
-$ go get -u github.com/tools/godep
-```
-
-Then save the dependencies in your project:
-
-```sh
-$ godep save ./...
+$ glide get github.com/foo/bar
 ```
 
 ### Protobuf
@@ -223,6 +219,4 @@ In order to set the version number, compile Pilosa with the following argument:
 $ go install --ldflags="-X main.Version=1.0.0"
 ```
 
-[godep]: https://github.com/tools/godep
-
-
+[Glide]: http://glide.sh/
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 000000000..d4a83ea8f
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,36 @@
+hash: d912921b0318c326771cd49debeec509d4ffb0558bd37e53570f6404fbec6604
+updated: 2016-11-29T16:10:39.53889541-06:00
+imports:
+- name: github.com/boltdb/bolt
+  version: 4b1ebc1869ad66568b313d0dc410e2be72670dda
+- name: github.com/BurntSushi/toml
+  version: 99064174e013895bbd9b025c31100bd1d9b590ca
+- name: github.com/DataDog/datadog-go
+  version: 909c02b65dd8a52e8fa6072db9752a112227cf21
+  subpackages:
+  - statsd
+- name: github.com/davecgh/go-spew
+  version: 346938d642f2ec3594ed81d874461961cd0faa76
+  subpackages:
+  - spew
+- name: github.com/gogo/protobuf
+  version: a9cd0c35b97daf74d0ebf3514c5254814b2703b4
+  subpackages:
+  - proto
+- name: github.com/golang/groupcache
+  version: a6b377e3400b08991b80d6805d627f347f983866
+  subpackages:
+  - lru
+- name: golang.org/x/net
+  version: 4971afdc2f162e82d185353533d3cf16188a9f4e
+  subpackages:
+  - context
+- name: golang.org/x/sync
+  version: 1ae7c7b29e06598039be46c5083819ba6fd7a97e
+  subpackages:
+  - errgroup
+- name: golang.org/x/sys
+  version: c200b10b5d5e122be351b67af224adc6128af5bf
+  subpackages:
+  - unix
+testImports: []
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 000000000..be20b88e5
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,29 @@
+package: github.com/pilosa/pilosa
+import:
+- package: github.com/BurntSushi/toml
+  version: 99064174e013895bbd9b025c31100bd1d9b590ca
+- package: github.com/DataDog/datadog-go
+  version: ~1.0.0
+  subpackages:
+  - statsd
+- package: github.com/boltdb/bolt
+  version: 4b1ebc1869ad66568b313d0dc410e2be72670dda
+- package: github.com/davecgh/go-spew
+  version: ~1.1.0
+  subpackages:
+  - spew
+- package: github.com/gogo/protobuf
+  version: a9cd0c35b97daf74d0ebf3514c5254814b2703b4
+  subpackages:
+  - proto
+- package: github.com/golang/groupcache
+  version: a6b377e3400b08991b80d6805d627f347f983866
+  subpackages:
+  - lru
+- package: golang.org/x/sys
+  version: c200b10b5d5e122be351b67af224adc6128af5bf
+  subpackages:
+  - unix
+- package: golang.org/x/sync
+  subpackages:
+  - errgroup