diff --git a/.gitignore b/.gitignore
index 593c721..6ca11df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ host_key.pub
 ssh-chat
 *.log
 .*
+vendor/
+*.lock
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 6a104c5..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,19 +0,0 @@
-[submodule "vendor/github.com/alexcesaro/log"]
-	path = vendor/github.com/alexcesaro/log
-	url = https://github.com/alexcesaro/log
-	branch = master
-[submodule "vendor/github.com/jessevdk/go-flags"]
-	path = vendor/github.com/jessevdk/go-flags
-	url = https://github.com/jessevdk/go-flags
-	branch = master
-[submodule "vendor/github.com/shazow/rateio"]
-	path = vendor/github.com/shazow/rateio
-	url = https://github.com/shazow/rateio
-	branch = master
-[submodule "vendor/github.com/dustin/go-humanize"]
-	path = vendor/github.com/dustin/go-humanize
-	url = https://github.com/dustin/go-humanize
-	branch = master
-[submodule "vendor/github.com/howeyc/gopass"]
-	path = vendor/github.com/howeyc/gopass
-	url = https://github.com/howeyc/gopass.git
diff --git a/.travis.yml b/.travis.yml
index 16c5cec..1ad6115 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,15 @@ notifications:
 language: go
 
 go:
-  - 1.6
-  - 1.7
+  - 1.8
+  - 1.9
 
 env:
   - CGO_ENABLED=0
 
 install:
   - go get -t ./...
+  - go get -u github.com/golang/dep
   - go get github.com/gordonklaus/ineffassign
 
 script:
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000..f3da934
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,46 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# 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"
+
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/alexcesaro/log"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/dustin/go-humanize"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/howeyc/gopass"
+
+[[constraint]]
+  name = "github.com/jessevdk/go-flags"
+  version = "1.3.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/shazow/rateio"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/crypto"
diff --git a/Makefile b/Makefile
index 43a897a..4bdc444 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ $(BINARY): deps **/**/*.go **/*.go *.go
 	go build $(BUILDFLAGS) ./cmd/ssh-chat
 
 deps:
-	go get ./...
+	dep ensure
 
 build: $(BINARY)
 
diff --git a/vendor/github.com/alexcesaro/log b/vendor/github.com/alexcesaro/log
deleted file mode 160000
index 61e6862..0000000
--- a/vendor/github.com/alexcesaro/log
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 61e686294e58a8698a9e1091268bb4ac1116bd5e
diff --git a/vendor/github.com/dustin/go-humanize b/vendor/github.com/dustin/go-humanize
deleted file mode 160000
index 2fcb520..0000000
--- a/vendor/github.com/dustin/go-humanize
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8
diff --git a/vendor/github.com/howeyc/gopass b/vendor/github.com/howeyc/gopass
deleted file mode 160000
index 26c6e11..0000000
--- a/vendor/github.com/howeyc/gopass
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 26c6e1184fd5255fa5f5289d0b789a4819c203a4
diff --git a/vendor/github.com/jessevdk/go-flags b/vendor/github.com/jessevdk/go-flags
deleted file mode 160000
index f2785f5..0000000
--- a/vendor/github.com/jessevdk/go-flags
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f2785f5820ec967043de79c8be97edfc464ca745
diff --git a/vendor/github.com/shazow/rateio b/vendor/github.com/shazow/rateio
deleted file mode 160000
index e8e0088..0000000
--- a/vendor/github.com/shazow/rateio
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e8e00881e5c12090412414be41c04ca9c8a71106