diff --git a/Makefile b/Makefile
index e9198b243..57dd348af 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,11 @@ godeps:
 	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              && 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)
+	(cd $(GOPATH)/src/golang.org/x/net                    && git checkout -q release-branch.go1.9)
+	(cd $(GOPATH)/src/golang.org/x/text                   && git checkout -q e19ae1496984b1c655b8044a65c0300a3c878dd3)
 
 .PHONY: travis
 travis: check