diff --git a/components/engine/Makefile b/components/engine/Makefile
index 1447a4ed12..dd992946a4 100644
--- a/components/engine/Makefile
+++ b/components/engine/Makefile
@@ -1,14 +1,18 @@
 default: build
 
-build:
+build: bundles
 	docker build -t docker .
-	docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh binary
+	docker run -privileged -v `pwd`/bundles:/go/src/github.com/dotcloud/docker/bundles docker hack/make.sh binary
 
 doc:
-	cd docs && docker build -t docker:docs . && docker run -p 8000:8000 docker:docs
+	cd docs && docker build -t docker-docs . && docker run -p 8000:8000 docker-docs
 
-test:
-	docker run -privileged -v `pwd`:/go/src/github.com/dotcloud/docker docker hack/make.sh test
+test: bundles
+	docker run -privileged -v `pwd`/bundles:/go/src/github.com/dotcloud/docker/bundles docker hack/make.sh test
 
 shell:
 	docker run -privileged -i -t docker bash
+
+bundles:
+	mkdir bundles
+