diff --git a/.gitignore b/.gitignore
index 809fa8e268..4bbbb2a127 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,4 @@ command-line-arguments.test
 .flymake*
 docker.test
 auth/auth.test
-build/
+.gopath/
diff --git a/Makefile b/Makefile
index 3b8b1e9249..be67fcc232 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DOCKER_PACKAGE := github.com/dotcloud/docker
 
-BUILD_DIR := $(CURDIR)/build
+BUILD_DIR := $(CURDIR)/.gopath
 
 GOPATH ?= $(BUILD_DIR)
 export GOPATH