diff --git a/.gitmodules b/.gitmodules
index 56d0de50..75ed3ea2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "vendor/github.com/coreos/etcd"]
 	path = vendor/github.com/coreos/etcd
 	url = https://github.com/coreos/etcd/
+[submodule "vendor/google.golang.org/grpc"]
+	path = vendor/google.golang.org/grpc
+	url = https://github.com/grpc/grpc-go
+[submodule "vendor/github.com/grpc-ecosystem/grpc-gateway"]
+	path = vendor/github.com/grpc-ecosystem/grpc-gateway
+	url = https://github.com/grpc-ecosystem/grpc-gateway
diff --git a/vendor/github.com/coreos/etcd b/vendor/github.com/coreos/etcd
index 9e9bbb82..e2d51961 160000
--- a/vendor/github.com/coreos/etcd
+++ b/vendor/github.com/coreos/etcd
@@ -1 +1 @@
-Subproject commit 9e9bbb829ef25181e5178138af6349f7971cba59
+Subproject commit e2d51961dd4abe6540c7d8e4aac0da7addf2e16e
diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway b/vendor/github.com/grpc-ecosystem/grpc-gateway
new file mode 160000
index 00000000..acebe0f9
--- /dev/null
+++ b/vendor/github.com/grpc-ecosystem/grpc-gateway
@@ -0,0 +1 @@
+Subproject commit acebe0f9ff5993e130b141ee60e83e592839ca22
diff --git a/vendor/google.golang.org/grpc b/vendor/google.golang.org/grpc
new file mode 160000
index 00000000..231b4cfe
--- /dev/null
+++ b/vendor/google.golang.org/grpc
@@ -0,0 +1 @@
+Subproject commit 231b4cfea0e79843053a33f5fe90bd4d84b23cd3