diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 00000000..89d84a8d
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,108 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  digest = "1:175329dd2057b6d854a9e5094fb5ac63734c19e3f44e1329d5a05a517f2c3d4e"
+  name = "github.com/NYTimes/gziphandler"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "967539e5e271a2bc9b3dcb1285078a1b1df105ae"
+
+[[projects]]
+  digest = "1:01d3c3dfb7ef9da24cd00cbd5b9e2c147fa7a3f44a83028bc737da9cac7ed60b"
+  name = "github.com/codegangsta/cli"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"
+  version = "v1.19.1"
+
+[[projects]]
+  digest = "1:1f1d454098ba2f8e7b87f0166e30533a72dddb80bace79643a78933fa4889613"
+  name = "github.com/elazarl/go-bindata-assetfs"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "d5cac425555ca5cf00694df246e04f05e6a55150"
+
+[[projects]]
+  digest = "1:e8d4b6192477ea62f1b47836096df7227996ad7489816acd2541ec383a0c2fb6"
+  name = "github.com/fatih/structs"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "a9f7daa9c2729e97450c2da2feda19130a367d8f"
+
+[[projects]]
+  digest = "1:3b3c418e9b9d646c509643f2b39e532338e1e6a66f79856aa5512bb6a0f68e2b"
+  name = "github.com/gorilla/websocket"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "b6ab76f1fe9803ee1d59e7e5b2a797c1fe897ce5"
+
+[[projects]]
+  digest = "1:c52278661cbea5976352b09eeb1478012fc7f6097c8ffd1d30053876d75ac585"
+  name = "github.com/hashicorp/go-multierror"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "56912fb08d85084aa318edcf2bba735b97cf35c5"
+
+[[projects]]
+  digest = "1:5b1c18041a38d54fbcad42875d1279778712b4c849d3c23718513c5e3d740ef9"
+  name = "github.com/kr/pty"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "5cf931ef8f76dccd0910001d74a58a7fca84a83d"
+
+[[projects]]
+  digest = "1:5c77ec0df6475d5fc9bc636ebd00a2585310c4e44c8a30c83f0f5f0c4b53d717"
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "248dadf4e9068a0b3e79f02ed0a610d935de5302"
+
+[[projects]]
+  digest = "1:b7c69b0826d8d704bfdc90846233c4e92ede53478586dd8edc6189c2c6c6462d"
+  name = "github.com/yudai/gotty"
+  packages = [
+    "backend/localcommand",
+    "pkg/homedir",
+    "pkg/randomstring",
+    "server",
+    "utils",
+    "webtty",
+  ]
+  pruneopts = "UT"
+  revision = "a080c85cbc59226c94c6941ad8c395232d72d517"
+  version = "v2.0.0-alpha.3"
+
+[[projects]]
+  branch = "master"
+  digest = "1:78b90b63408aae5fc8a5114a2551cf7a923e9a1f63535389d366f0938b07e1f8"
+  name = "github.com/yudai/hcl"
+  packages = [
+    ".",
+    "hcl",
+    "json",
+  ]
+  pruneopts = "UT"
+  revision = "5fa2393b3552119bf33a69adb1402a1160cba23d"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  input-imports = [
+    "github.com/NYTimes/gziphandler",
+    "github.com/codegangsta/cli",
+    "github.com/elazarl/go-bindata-assetfs",
+    "github.com/fatih/structs",
+    "github.com/gorilla/websocket",
+    "github.com/kr/pty",
+    "github.com/pkg/errors",
+    "github.com/yudai/gotty/backend/localcommand",
+    "github.com/yudai/gotty/pkg/homedir",
+    "github.com/yudai/gotty/pkg/randomstring",
+    "github.com/yudai/gotty/server",
+    "github.com/yudai/gotty/utils",
+    "github.com/yudai/gotty/webtty",
+    "github.com/yudai/hcl",
+  ]
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 00000000..23296e99
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,42 @@
+# Gopkg.toml example
+#
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# 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/codegangsta/cli"
+  version = "1.19.1"
+
+[[constraint]]
+  name = "github.com/yudai/gotty"
+  version = "2.0.0-alpha.3"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/yudai/hcl"
+
+[prune]
+  go-tests = true
+  unused-packages = true
diff --git a/Makefile b/Makefile
index 03265809..bd15f02b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,9 @@ VERSION = 2.0.0-alpha.3
 BUILD_OPTIONS = -ldflags "-X main.Version=$(VERSION) -X main.CommitID=$(GIT_COMMIT)"
 
 gotty: main.go server/*.go webtty/*.go backend/*.go Makefile
-	godep go build ${BUILD_OPTIONS}
+	dep init
+	dep ensure
+	go build ${BUILD_OPTIONS}
 
 .PHONY: asset
 asset: bindata/static/js/gotty-bundle.js bindata/static/index.html bindata/static/favicon.png bindata/static/css/index.css bindata/static/css/xterm.css bindata/static/css/xterm_customize.css
diff --git a/vendor/github.com/kr/pty/mktypes.bash b/vendor/github.com/kr/pty/mktypes.bash
old mode 100644
new mode 100755