diff --git a/.gitignore b/.gitignore
index 593c721c..9bcc9f9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ host_key.pub
 ssh-chat
 *.log
 .*
+vendor/
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 6a104c57..00000000
--- 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 16c5cec2..1ad61159 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.lock b/Gopkg.lock
new file mode 100644
index 00000000..ee99948b
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,51 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "github.com/alexcesaro/log"
+  packages = [".","golog"]
+  revision = "61e686294e58a8698a9e1091268bb4ac1116bd5e"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/dustin/go-humanize"
+  packages = ["."]
+  revision = "79e699ccd02f240a1f1fbbdcee7e64c1c12e41aa"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/howeyc/gopass"
+  packages = ["."]
+  revision = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+
+[[projects]]
+  name = "github.com/jessevdk/go-flags"
+  packages = ["."]
+  revision = "96dc06278ce32a0e9d957d590bb987c81ee66407"
+  version = "v1.3.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/shazow/rateio"
+  packages = ["."]
+  revision = "e8e00881e5c12090412414be41c04ca9c8a71106"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["curve25519","ed25519","ed25519/internal/edwards25519","ssh","ssh/terminal"]
+  revision = "9419663f5a44be8b34ca85f08abc5fe1be11f8a3"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix","windows"]
+  revision = "ebfc5b4631820b793c9010c87fd8fef0f39eb082"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "36fa3b8ab2269908ef899a2f5b7320cb792d3a1039cb68afc8b51becde57f850"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 00000000..f3da934f
--- /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 43a897a7..4bdc444a 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/README.md b/README.md
index 5ac22637..2ca2a788 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ amd64, and ARM6 for your RaspberryPi).
 ## Compiling / Developing
 
 You can compile ssh-chat by using `make build`. The resulting binary is portable and
-can be run on any system with a similar OS and CPU arch. Go 1.3 or higher is required to compile.
+can be run on any system with a similar OS and CPU arch. Go 1.8 or higher is required to compile.
 
 If you're developing on this repo, there is a handy Makefile that should set
 things up with `make run`.
diff --git a/vendor/github.com/alexcesaro/log b/vendor/github.com/alexcesaro/log
deleted file mode 160000
index 61e68629..00000000
--- 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 2fcb5204..00000000
--- 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 26c6e118..00000000
--- 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 f2785f58..00000000
--- 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 e8e00881..00000000
--- a/vendor/github.com/shazow/rateio
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e8e00881e5c12090412414be41c04ca9c8a71106