diff --git a/Makefile b/Makefile
index 57dd348af..0b01b0bc2 100644
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,17 @@ testk8s: check
 
 .PHONY: godeps
 godeps:
-	go get github.com/mholt/caddy
-	go get github.com/miekg/dns
-	go get github.com/prometheus/client_golang/prometheus/promhttp
-	go get github.com/prometheus/client_golang/prometheus
-	go get golang.org/x/net/context
-	go get golang.org/x/text
+	(cd $(GOPATH)/src/github.com/mholt/caddy 2>/dev/null              && git checkout -q master 2>/dev/null || true)
+	(cd $(GOPATH)/src/github.com/miekg/dns 2>/dev/null                && git checkout -q master 2>/dev/null || true)
+	(cd $(GOPATH)/src/github.com/prometheus/client_golang 2>/dev/null && git checkout -q master 2>/dev/null || true)
+	(cd $(GOPATH)/src/golang.org/x/net 2>/dev/null                    && git checkout -q master 2>/dev/null || true)
+	(cd $(GOPATH)/src/golang.org/x/text 2>/dev/null                   && git checkout -q master 2>/dev/null || true)
+	go get -u github.com/mholt/caddy
+	go get -u github.com/miekg/dns
+	go get -u github.com/prometheus/client_golang/prometheus/promhttp
+	go get -u github.com/prometheus/client_golang/prometheus
+	go get -u golang.org/x/net/context
+	go get -u golang.org/x/text
 	(cd $(GOPATH)/src/github.com/mholt/caddy              && git checkout -q v0.10.10)
 	(cd $(GOPATH)/src/github.com/miekg/dns                && git checkout -q v1.0.3)
 	(cd $(GOPATH)/src/github.com/prometheus/client_golang && git checkout -q v0.8.0)