diff --git a/Makefile b/Makefile
index 3e8b8321..f65d7329 100644
--- a/Makefile
+++ b/Makefile
@@ -2,19 +2,22 @@
 all: embed build
 
 deps:
+	[ -d $GOPATH/src/code.google.com/p/go ]       || hg clone -u default https://code.google.com/p/go $GOPATH/src/code.google.com/p/go
+	[ -d $GOPATH/src/github.com/dotcloud/docker ] || git clone git://github.com/dotcloud/docker $GOPATH/src/github.com/dotcloud/docker
 	go get code.google.com/p/go.crypto/bcrypt
 	go get code.google.com/p/go.crypto/ssh
 	go get code.google.com/p/go.net/websocket
 	go get code.google.com/p/go.text/unicode/norm
+	#go get code.google.com/p/go/src/pkg/archive/tar
 	go get launchpad.net/goyaml
 	go get github.com/andybons/hipchat
 	go get github.com/bmizerany/pat
 	go get github.com/dchest/authcookie
 	go get github.com/dchest/passwordreset
 	go get github.com/dchest/uniuri
-	go get github.com/dotcloud/docker/archive
-	go get github.com/dotcloud/docker/pkg/term
-	go get github.com/dotcloud/docker/utils
+	#go get github.com/dotcloud/docker/archive
+	#go get github.com/dotcloud/docker/utils
+	#go get github.com/dotcloud/docker/pkg/term
 	go get github.com/drone/go-github/github
 	go get github.com/drone/go-bitbucket/bitbucket
 	go get github.com/GeertJohan/go.rice