diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
deleted file mode 100644
index 3da7e30..0000000
--- a/Godeps/Godeps.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-	"ImportPath": "github.com/moul/gotty-client",
-	"GoVersion": "go1.6",
-	"GodepVersion": "v63",
-	"Packages": [
-		"github.com/moul/gotty-client",
-		"github.com/moul/gotty-client/cmd/gotty-client"
-	],
-	"Deps": [
-		{
-			"ImportPath": "github.com/Sirupsen/logrus",
-			"Comment": "v0.10.0-16-gcd7d1bb",
-			"Rev": "cd7d1bbe41066b6c1f19780f895901052150a575"
-		},
-		{
-			"ImportPath": "github.com/codegangsta/cli",
-			"Comment": "v1.17.0-27-g2ae9042",
-			"Rev": "2ae9042f5bcbaf15b01229f8395ba8e72e01bded"
-		},
-		{
-			"ImportPath": "github.com/creack/goselect",
-			"Rev": "40085cf5fd629ccd88dc328895f1f137d09a1de4"
-		},
-		{
-			"ImportPath": "github.com/gopherjs/gopherjs/js",
-			"Comment": "go1.5-62-gdb27c7c",
-			"Rev": "db27c7c470d7404b6b201f82d6fd4821260bd13e"
-		},
-		{
-			"ImportPath": "github.com/gorilla/websocket",
-			"Rev": "1f512fc3f05332ba7117626cdfb4e07474e58e60"
-		},
-		{
-			"ImportPath": "github.com/jtolds/gls",
-			"Comment": "v4.2.0",
-			"Rev": "8ddce2a84170772b95dd5d576c48d517b22cac63"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/assertions",
-			"Comment": "1.6.0-6-g40711f7",
-			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/assertions/internal/go-render/render",
-			"Comment": "1.6.0-6-g40711f7",
-			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/assertions/internal/oglematchers",
-			"Comment": "1.6.0-6-g40711f7",
-			"Rev": "40711f7748186bbf9c99977cd89f21ce1a229447"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/goconvey/convey",
-			"Comment": "1.6.2",
-			"Rev": "d4c757aa9afd1e2fc1832aaab209b5794eb336e1"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/goconvey/convey/gotest",
-			"Comment": "1.6.2",
-			"Rev": "d4c757aa9afd1e2fc1832aaab209b5794eb336e1"
-		},
-		{
-			"ImportPath": "github.com/smartystreets/goconvey/convey/reporting",
-			"Comment": "1.6.2",
-			"Rev": "d4c757aa9afd1e2fc1832aaab209b5794eb336e1"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/ssh/terminal",
-			"Rev": "5bcd134fee4dd1475da17714aac19c0aa0142e2f"
-		},
-		{
-			"ImportPath": "golang.org/x/sys/unix",
-			"Rev": "d4feaf1a7e61e1d9e79e6c4e76c6349e9cab0a03"
-		}
-	]
-}
diff --git a/Godeps/Readme b/Godeps/Readme
deleted file mode 100644
index 4cdaa53..0000000
--- 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/glide.yaml b/glide.yaml
new file mode 100644
index 0000000..287efb9
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,35 @@
+package: github.com/moul/gotty-client
+import:
+- package: github.com/Sirupsen/logrus
+  version: cd7d1bbe41066b6c1f19780f895901052150a575
+- package: github.com/codegangsta/cli
+  version: 2ae9042f5bcbaf15b01229f8395ba8e72e01bded
+- package: github.com/creack/goselect
+  version: 40085cf5fd629ccd88dc328895f1f137d09a1de4
+- package: github.com/gopherjs/gopherjs
+  version: db27c7c470d7404b6b201f82d6fd4821260bd13e
+  subpackages:
+  - js
+- package: github.com/gorilla/websocket
+  version: 1f512fc3f05332ba7117626cdfb4e07474e58e60
+- package: github.com/jtolds/gls
+  version: 8ddce2a84170772b95dd5d576c48d517b22cac63
+- package: github.com/smartystreets/assertions
+  version: 40711f7748186bbf9c99977cd89f21ce1a229447
+  subpackages:
+  - internal/go-render/render
+  - internal/oglematchers
+- package: github.com/smartystreets/goconvey
+  version: d4c757aa9afd1e2fc1832aaab209b5794eb336e1
+  subpackages:
+  - convey
+  - convey/gotest
+  - convey/reporting
+- package: golang.org/x/crypto
+  version: 5bcd134fee4dd1475da17714aac19c0aa0142e2f
+  subpackages:
+  - ssh/terminal
+- package: golang.org/x/sys
+  version: d4feaf1a7e61e1d9e79e6c4e76c6349e9cab0a03
+  subpackages:
+  - unix