diff --git a/.gitignore b/.gitignore
index 100b0cae2f..f906ef0e45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.swp
 vendor
 merkleeyes.db
+build
diff --git a/Makefile b/Makefile
index 7fe0004aa8..96897b2505 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
-all: test install
+GOTOOLS = \
+					github.com/mitchellh/gox \
+					github.com/Masterminds/glide
+PACKAGES=$(shell go list ./... | grep -v '/vendor/')
 
-NOVENDOR = go list ./... | grep -v /vendor/
+all: test install
 
 build:
 	go build ./cmd/...
@@ -9,11 +12,11 @@ install:
 	go install ./cmd/...
 
 dist:
-	@ sudo bash scripts/dist.sh
-	@ bash scripts/publish.sh
+	@bash scripts/dist.sh
+	@bash scripts/publish.sh
 
 test:
-	go test `${NOVENDOR}`
+	go test $(PACKAGES)
 	#go run tests/tendermint/*.go
 
 get_deps:
@@ -22,14 +25,16 @@ get_deps:
 update_deps:
 	go get -d -u ./...
 
-get_vendor_deps:
-	go get github.com/Masterminds/glide
+get_vendor_deps: tools
 	glide install
 
 build-docker:
 	docker run -it --rm -v "$(PWD):/go/src/github.com/tendermint/basecoin" -w "/go/src/github.com/tendermint/basecoin" -e "CGO_ENABLED=0" golang:alpine go build ./cmd/basecoin
 	docker build -t "tendermint/basecoin" .
 
+tools:
+	go get -u -v $(GOTOOLS)
+
 clean:
 	@rm -f ./basecoin