diff --git a/Gopkg.lock b/Gopkg.lock
index 9218028bc4d9..f6ac493833a7 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -151,9 +151,10 @@
   revision = "3a0bb77429bd3a61596f5e8a3172445844342120"
 
 [[projects]]
+  branch = "master"
   name = "github.com/coreos/etcd"
   packages = ["raft","raft/raftpb"]
-  revision = "6dd807481cebac062e82c5ecaecdb2c3d0f605ad"
+  revision = "d2654f85223276cfb6c1803d6e2bcc5db91c17ba"
 
 [[projects]]
   name = "github.com/cpuguy83/go-md2man"
@@ -659,6 +660,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "7da157eca498fe957e185931fe43036e08ed977ae4abd7fe9a7cac5ac001a465"
+  inputs-digest = "f9ae1d1f3ee2271b84771ce05b074f3438cc66b54910b9355d1789b157e774ad"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index e090ec674eea..30ee1fdeec1e 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -48,3 +48,7 @@ ignored = [
   name = "github.com/chzyer/readline"
   source = "https://github.com/cockroachdb/readline"
   branch = "master"
+
+[[constraint]]
+  name = "github.com/coreos/etcd"
+  branch = "master"
diff --git a/vendor b/vendor
index 186c3b893e21..cb8ae2a779ae 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 186c3b893e2149312d7ce338083bf1f29cd6d177
+Subproject commit cb8ae2a779ae7a2fe27179afab7a028e2e7062bb