diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..b0e1ba591b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.git
+build
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 68fc691841..30944692f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 .DS_Store
-/build
+build
diff --git a/Makefile b/Makefile
index 2ddc4063e5..04aa21e182 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 
 # build the CLI
 build: clean
-	@go build -o ./build/docker ./cmd/docker
+	@go build -o ./build/docker github.com/docker/cli/cmd/docker
 
 # remove build artifacts
 clean:
@@ -21,4 +21,4 @@ test:
 cross: clean
 	@gox -output build/docker-{{.OS}}-{{.Arch}} \
 		 -osarch="linux/arm linux/amd64 darwin/amd64 windows/amd64" \
-		 ./cmd/docker
+		 github.com/docker/cli/cmd/docker
diff --git a/docker.Makefile b/docker.Makefile
index ee03ce0fe5..81865e4c5c 100644
--- a/docker.Makefile
+++ b/docker.Makefile
@@ -10,7 +10,7 @@ DEV_DOCKER_IMAGE_NAME = docker_cli_dev
 
 # build docker image (dockerfiles/Dockerfile.build)
 build_docker_image:
-	@docker build -t $(DEV_DOCKER_IMAGE_NAME) -f ./dockerfiles/Dockerfile.build . > /dev/null
+	@docker build -q -t $(DEV_DOCKER_IMAGE_NAME) -f ./dockerfiles/Dockerfile.build .
 
 # build executable using a container
 build: build_docker_image