diff --git a/.gitignore b/.gitignore
index 1ffd82d..f151e23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,7 @@
 
 # Rendered manpage
 gocryptfs.1
+
+# Dependencies copied by "dep"
+/vendor
+/_vendor-*
diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 0000000..f89c9e8
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,45 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hanwen/go-fuse"
+  packages = ["fuse","fuse/nodefs","fuse/pathfs","splice"]
+  revision = "8412ede026c468f5bd2126c53308fc723ccb69d1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/jacobsa/crypto"
+  packages = ["cmac","common","siv"]
+  revision = "293ce0c192fb4f59cd879b46544922b9ed09a13a"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/rfjakob/eme"
+  packages = ["."]
+  revision = "7c8316a9cb0a6af865265f899f5de6aadb31a24b"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["hkdf","pbkdf2","scrypt","ssh/terminal"]
+  revision = "81e90905daefcd6fd217b62423c0908922eadb30"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sync"
+  packages = ["syncmap"]
+  revision = "f52d1811a62927559de87708c8913c1650ce4f26"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix","windows"]
+  revision = "9aade4d3a3b7e6d876cd3823ad20ec45fc035402"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "146e0ce80d2f3218b67980d099db45a0e27383d18c0ca03ef29ab99382797c68"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000..0641c78
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,19 @@
+[[constraint]]
+  branch = "master"
+  name = "github.com/hanwen/go-fuse"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/jacobsa/crypto"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/rfjakob/eme"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/sync"
diff --git a/go1.4.go b/go1.4.go
index 7c01ce8..3ca5307 100644
--- a/go1.4.go
+++ b/go1.4.go
@@ -4,4 +4,4 @@ package main
 
 // Cause an early compile error on Go 1.4 an lower. We need Go 1.5 for a number
 // of reasons, among them NewGCMWithNonceSize, RawURLEncoding, runtime/trace.
-import "You_need_Go_1.5_or_higher_to_compile_gocryptfs"
+import "You_need_Go_1_5_or_higher_to_compile_gocryptfs"