diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 0000000000000000000000000000000000000000..83e2d211a1eeabb9432c72a4daee299039f6197f
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,157 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  name = "cloud.google.com/go"
+  packages = ["compute/metadata"]
+  revision = "934866196d63fdcd8291ef6f16e70f4a830cda22"
+
+[[projects]]
+  name = "github.com/armon/go-metrics"
+  packages = ["."]
+  revision = "97c69685293dce4c0a2d0b19535179bbc976e4d2"
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "6d212800a42e8ab5c146b8ace3490ee17e5225f9"
+
+[[projects]]
+  name = "github.com/dgrijalva/jwt-go"
+  packages = ["."]
+  revision = "d2709f9f1f31ebcda9651b03077758c1f3a0018c"
+  version = "v3.0.0"
+
+[[projects]]
+  name = "github.com/elazarl/go-bindata-assetfs"
+  packages = ["."]
+  revision = "9a6736ed45b44bf3835afeebb3034b57ed329f3e"
+
+[[projects]]
+  name = "github.com/fatih/structs"
+  packages = ["."]
+  revision = "a720dfa8df582c51dee1b36feabb906bde1588bd"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "v2"
+  name = "github.com/go-yaml/yaml"
+  packages = ["."]
+  revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"
+
+[[projects]]
+  name = "github.com/gogo/protobuf"
+  packages = ["jsonpb","proto","sortkeys","types"]
+  revision = "100ba4e885062801d56799d78530b73b178a78f3"
+  version = "v0.4"
+
+[[projects]]
+  name = "github.com/golang/protobuf"
+  packages = ["proto"]
+  revision = "8ee79997227bf9b34611aee7946ae64735e6fd93"
+
+[[projects]]
+  name = "github.com/gorhill/cronexpr"
+  packages = ["."]
+  revision = "a557574d6c024ed6e36acc8b610f5f211c91568a"
+  version = "1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/gorilla/context"
+  packages = ["."]
+  revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"
+
+[[projects]]
+  name = "github.com/gorilla/handlers"
+  packages = ["."]
+  revision = "ee54c7b44cab12289237fb8631314790076e728b"
+  version = "v1.1"
+
+[[projects]]
+  name = "github.com/gorilla/mux"
+  packages = ["."]
+  revision = "0eeaf8392f5b04950925b8a69fe70f110fa7cbfc"
+  version = "v1.1"
+
+[[projects]]
+  name = "github.com/gorilla/websocket"
+  packages = ["."]
+  revision = "1f512fc3f05332ba7117626cdfb4e07474e58e60"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/lib/pq"
+  packages = [".","oid"]
+  revision = "22cb3e4c487ce6242e2b03369219e5631eed1221"
+
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"
+
+[[projects]]
+  name = "github.com/rubenv/sql-migrate"
+  packages = [".","sqlparse"]
+  revision = "a3ed23a40ebd39f82bf2a36768ed7d595f2bdc1e"
+
+[[projects]]
+  name = "github.com/satori/go.uuid"
+  packages = ["."]
+  revision = "b061729afc07e77a8aa4fad0a2fd840958f1942a"
+
+[[projects]]
+  name = "github.com/stretchr/testify"
+  packages = ["assert"]
+  revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"
+  version = "v1.1.4"
+
+[[projects]]
+  name = "github.com/yuin/gopher-lua"
+  packages = [".","ast","parse","pm"]
+  revision = "2243d714d6c94951d8ccca8c851836ff47d401c9"
+
+[[projects]]
+  name = "go.uber.org/atomic"
+  packages = ["."]
+  revision = "4e336646b2ef9fc6e47be8e21594178f98e5ebcf"
+  version = "v1.2.0"
+
+[[projects]]
+  name = "go.uber.org/zap"
+  packages = [".","buffer","internal/bufferpool","internal/color","internal/exit","internal/multierror","zapcore"]
+  revision = "9cabc84638b70e564c3dab2766efcb1ded2aac9f"
+  version = "v1.4.1"
+
+[[projects]]
+  name = "golang.org/x/crypto"
+  packages = ["bcrypt","blowfish"]
+  revision = "f6b343c37ca80bfa8ea539da67a0b621f84fab1d"
+
+[[projects]]
+  name = "golang.org/x/net"
+  packages = ["context","context/ctxhttp"]
+  revision = "69d4b8aa71caaaa75c3dfc11211d1be495abec7c"
+
+[[projects]]
+  name = "golang.org/x/oauth2"
+  packages = [".","google","internal","jws","jwt"]
+  revision = "cce311a261e6fcf29de72ca96827bdb0b7d9c9e6"
+
+[[projects]]
+  name = "google.golang.org/appengine"
+  packages = [".","internal","internal/app_identity","internal/base","internal/datastore","internal/log","internal/modules","internal/remote_api","internal/urlfetch","urlfetch"]
+  revision = "ad2570cd3913654e00c5f0183b39d2f998e54046"
+
+[[projects]]
+  name = "gopkg.in/gorp.v1"
+  packages = ["."]
+  revision = "c87af80f3cc5036b55b83d77171e156791085e2e"
+  version = "v1.7.1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "9bb457dbd056b3d2d11c7230286f5f8e0e5320e125201c02663c6c2f11d5b23e"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000000000000000000000000000000000000..8d84ddd5c226fa9773d29310c3a8282b1cf548e5
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,67 @@
+[[constraint]]
+  name = "github.com/armon/go-metrics"
+
+[[constraint]]
+  name = "github.com/dgrijalva/jwt-go"
+  version = "~3.0.0"
+
+[[constraint]]
+  name = "github.com/elazarl/go-bindata-assetfs"
+
+[[constraint]]
+  name = "github.com/fatih/structs"
+  version = "~1.0.0"
+
+[[constraint]]
+  branch = "v2"
+  name = "github.com/go-yaml/yaml"
+
+[[constraint]]
+  name = "github.com/gogo/protobuf"
+  version = "0.4.0"
+
+[[constraint]]
+  name = "github.com/gorhill/cronexpr"
+  version = "~1.0.0"
+
+[[constraint]]
+  name = "github.com/gorilla/handlers"
+  version = "~1.1.0"
+
+[[constraint]]
+  name = "github.com/gorilla/mux"
+  version = "~1.1.0"
+
+[[constraint]]
+  name = "github.com/gorilla/websocket"
+  version = "~1.0.0"
+
+[[constraint]]
+  name = "github.com/lib/pq"
+
+[[constraint]]
+  name = "github.com/rubenv/sql-migrate"
+
+[[constraint]]
+  name = "github.com/satori/go.uuid"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "~1.1.4"
+
+[[constraint]]
+  name = "github.com/yuin/gopher-lua"
+
+[[constraint]]
+  name = "go.uber.org/atomic"
+  version = "~1.2.0"
+
+[[constraint]]
+  name = "go.uber.org/zap"
+  version = "~1.4.0"
+
+[[constraint]]
+  name = "golang.org/x/crypto"
+
+[[constraint]]
+  name = "golang.org/x/net"
diff --git a/README.md b/README.md
index b392599802a5a5f8c875c30278daeb30f3d1d29d..0c36e10f1173ec721e5559b86ed2b0f3c5cb9ade 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ To build the codebase you will need to install these dependencies:
 
 * __go__ The Go compiler toolchain.
 * __nodejs__ A JavaScript runtime.
-* __glide__ A dependency manager for Go projects.
+* __dep__ A dependency manager for Go projects.
 * __protobuf__ A toolchain used to create custom protocols.
 * __make__ A rule-based build tool (installed by default on most platforms).
 
@@ -70,7 +70,7 @@ You'll need to setup your Go environment variables like `GOPATH` as usual. You c
 $> git clone https://github.com/heroiclabs/nakama
 $> cd nakama
 $> make gettools
-$> glide install
+$> dep ensure
 ```
 
 To run a Nakama server you'll need to connect it to a database. The system has been specially designed to work with CockroachDB for storage and queries. You can install it on OS X with `brew install cockroach`. For more detailed instructions see their [documentation](https://www.cockroachlabs.com/docs/install-cockroachdb.html).
diff --git a/glide.lock b/glide.lock
deleted file mode 100644
index 9c7b8c0df41d1b4971833577088af700ba861176..0000000000000000000000000000000000000000
--- a/glide.lock
+++ /dev/null
@@ -1,113 +0,0 @@
-hash: ff9abb7b8ba5a48c7ca600b2e89bc295be3d62101e22ef8ed817b7114a3015a7
-updated: 2017-07-09T16:20:42.443074055+01:00
-imports:
-- name: cloud.google.com/go
-  version: 934866196d63fdcd8291ef6f16e70f4a830cda22
-  subpackages:
-  - compute/metadata
-- name: github.com/armon/go-metrics
-  version: 97c69685293dce4c0a2d0b19535179bbc976e4d2
-- name: github.com/dgrijalva/jwt-go
-  version: d2709f9f1f31ebcda9651b03077758c1f3a0018c
-- name: github.com/elazarl/go-bindata-assetfs
-  version: 9a6736ed45b44bf3835afeebb3034b57ed329f3e
-  subpackages:
-  - '...'
-- name: github.com/fatih/structs
-  version: a720dfa8df582c51dee1b36feabb906bde1588bd
-- name: github.com/go-gorp/gorp
-  version: 4deece61034873cb5b5416e81abe4cea7bd0da72
-- name: github.com/go-yaml/yaml
-  version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
-- name: github.com/gogo/protobuf
-  version: 100ba4e885062801d56799d78530b73b178a78f3
-  subpackages:
-  - jsonpb
-  - proto
-  - sortkeys
-  - types
-- name: github.com/golang/protobuf
-  version: 8ee79997227bf9b34611aee7946ae64735e6fd93
-  subpackages:
-  - proto
-- name: github.com/gorhill/cronexpr
-  version: a557574d6c024ed6e36acc8b610f5f211c91568a
-- name: github.com/gorilla/context
-  version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42
-- name: github.com/gorilla/handlers
-  version: ee54c7b44cab12289237fb8631314790076e728b
-- name: github.com/gorilla/mux
-  version: 0eeaf8392f5b04950925b8a69fe70f110fa7cbfc
-- name: github.com/gorilla/websocket
-  version: 1f512fc3f05332ba7117626cdfb4e07474e58e60
-- name: github.com/lib/pq
-  version: 22cb3e4c487ce6242e2b03369219e5631eed1221
-  subpackages:
-  - oid
-- name: github.com/rubenv/sql-migrate
-  version: a3ed23a40ebd39f82bf2a36768ed7d595f2bdc1e
-  subpackages:
-  - sqlparse
-- name: github.com/satori/go.uuid
-  version: b061729afc07e77a8aa4fad0a2fd840958f1942a
-- name: github.com/yuin/gopher-lua
-  version: 2243d714d6c94951d8ccca8c851836ff47d401c9
-  subpackages:
-  - ast
-  - parse
-  - pm
-- name: go.uber.org/atomic
-  version: 4e336646b2ef9fc6e47be8e21594178f98e5ebcf
-- name: go.uber.org/zap
-  version: 9cabc84638b70e564c3dab2766efcb1ded2aac9f
-  subpackages:
-  - buffer
-  - internal/bufferpool
-  - internal/color
-  - internal/exit
-  - internal/multierror
-  - zapcore
-- name: golang.org/x/crypto
-  version: f6b343c37ca80bfa8ea539da67a0b621f84fab1d
-  subpackages:
-  - bcrypt
-  - blowfish
-- name: golang.org/x/net
-  version: 69d4b8aa71caaaa75c3dfc11211d1be495abec7c
-  subpackages:
-  - context
-  - context/ctxhttp
-- name: golang.org/x/oauth2
-  version: cce311a261e6fcf29de72ca96827bdb0b7d9c9e6
-  subpackages:
-  - google
-  - internal
-  - jws
-  - jwt
-- name: google.golang.org/appengine
-  version: ad2570cd3913654e00c5f0183b39d2f998e54046
-  subpackages:
-  - internal
-  - internal/app_identity
-  - internal/base
-  - internal/datastore
-  - internal/log
-  - internal/modules
-  - internal/remote_api
-  - internal/urlfetch
-  - urlfetch
-- name: gopkg.in/gorp.v1
-  version: c87af80f3cc5036b55b83d77171e156791085e2e
-testImports:
-- name: github.com/davecgh/go-spew
-  version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
-  subpackages:
-  - spew
-- name: github.com/pmezard/go-difflib
-  version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
-  subpackages:
-  - difflib
-- name: github.com/stretchr/testify
-  version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
-  subpackages:
-  - assert
diff --git a/glide.yaml b/glide.yaml
deleted file mode 100644
index 03330245da56c8a3041308cad717b90ad8702e42..0000000000000000000000000000000000000000
--- a/glide.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-package: nakama
-homepage: https://heroiclabs.com
-license: Apache2
-owners:
-- name: Chris Molozian
-  email: chris@herioclabs.com
-- name: Andrei Mihu
-  email: andrei@herioclabs.com
-- name: Mo Firouz
-  email: mo@herioclabs.com
-import:
-- package: golang.org/x/net
-  subpackages:
-  - context
-- package: golang.org/x/crypto
-  subpackages:
-  - bcrypt
-- package: golang.org/x/oauth2/google
-- package: cloud.google.com/go/compute/metadata
-- package: github.com/golang/protobuf
-- package: github.com/gogo/protobuf
-  version: ~0.4.0
-- package: github.com/gorilla/websocket
-  version: ~1.0.0
-- package: github.com/gorilla/mux
-  version: ~1.1
-- package: github.com/gorilla/handlers
-  version: ~1.1
-- package: github.com/lib/pq
-- package: github.com/rubenv/sql-migrate
-- package: github.com/go-gorp/gorp
-  version: ~2.0.0
-- package: github.com/go-yaml/yaml
-  version: v2
-- package: github.com/armon/go-metrics
-- package: go.uber.org/zap
-  version: ~1.4.0
-- package: go.uber.org/atomic
-  version: ~1.2.0
-- package: github.com/satori/go.uuid
-- package: github.com/dgrijalva/jwt-go
-  version: ~3.0.0
-- package: github.com/elazarl/go-bindata-assetfs
-  subpackages:
-  - '...'
-- package: github.com/gorhill/cronexpr
-  version: ~1.0.0
-- package: github.com/yuin/gopher-lua
-- package: github.com/fatih/structs
-  version: ~1.0.0
-testImport:
-- package: github.com/stretchr/testify
-  version: ~1.1.4