diff --git a/cmd/Godeps/Godeps.json b/cmd/Godeps/Godeps.json
index 63d513968..829dc1996 100644
--- a/cmd/Godeps/Godeps.json
+++ b/cmd/Godeps/Godeps.json
@@ -1,7 +1,7 @@
 {
 	"ImportPath": "github.com/coreos/etcd",
 	"GoVersion": "go1.6",
-	"GodepVersion": "v63",
+	"GodepVersion": "v71",
 	"Packages": [
 		"./..."
 	],
@@ -213,39 +213,39 @@
 		},
 		{
 			"ImportPath": "google.golang.org/grpc",
-			"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
+			"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/codes",
-			"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
+			"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/credentials",
-			"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
+			"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/grpclog",
-			"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
+			"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/internal",
-			"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
+			"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/metadata",
-			"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
+			"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/naming",
-			"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
+			"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/peer",
-			"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
+			"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
 		},
 		{
 			"ImportPath": "google.golang.org/grpc/transport",
-			"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
+			"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
 		},
 		{
 			"ImportPath": "gopkg.in/cheggaaa/pb.v1",
diff --git a/cmd/vendor/google.golang.org/grpc/server.go b/cmd/vendor/google.golang.org/grpc/server.go
index d3a8073d9..2df90dbf5 100644
--- a/cmd/vendor/google.golang.org/grpc/server.go
+++ b/cmd/vendor/google.golang.org/grpc/server.go
@@ -257,12 +257,14 @@ func (s *Server) useTransportAuthenticator(rawConn net.Conn) (net.Conn, credenti
 // Serve accepts incoming connections on the listener lis, creating a new
 // ServerTransport and service goroutine for each. The service goroutines
 // read gRPC requests and then call the registered handlers to reply to them.
-// Service returns when lis.Accept fails.
+// Service returns when lis.Accept fails. lis will be closed when
+// this method returns.
 func (s *Server) Serve(lis net.Listener) error {
 	s.mu.Lock()
 	s.printf("serving")
 	if s.lis == nil {
 		s.mu.Unlock()
+		lis.Close()
 		return ErrServerStopped
 	}
 	s.lis[lis] = true