diff --git a/tm-monitor/LICENSE b/tm-monitor/LICENSE
index 8fd56597f..20728d318 100644
--- a/tm-monitor/LICENSE
+++ b/tm-monitor/LICENSE
@@ -1,3 +1,4 @@
+Tendermint Monitor
 Copyright 2017 Tendermint
 
                                  Apache License
diff --git a/tm-monitor/Makefile b/tm-monitor/Makefile
index 3cfc9976a..0913c0578 100644
--- a/tm-monitor/Makefile
+++ b/tm-monitor/Makefile
@@ -1,32 +1,32 @@
 DIST_DIRS := find * -type d -exec
 VERSION := $(shell perl -ne '/^var version.*"([^"]+)".*$$/ && print "v$$1\n"' main.go)
 GOTOOLS = \
-					github.com/Masterminds/glide \
 					github.com/mitchellh/gox
-PACKAGES=$(shell go list ./... | grep -v '/vendor/')
+PACKAGES=$(shell go list ./... | grep -v '/vendor')
 
 tools:
-	go get -v $(GOTOOLS)
+	go get $(GOTOOLS)
 
-get_vendor_deps: tools
+get_vendor_deps:
+	@hash glide 2>/dev/null || go get github.com/Masterminds/glide
 	glide install
 
 build:
-	go build -ldflags "-X main.version=${VERSION}"
+	go build
 
 install:
-	go install -ldflags "-X main.version=${VERSION}"
+	go install
 
 test:
-	@go test $(PACKAGES)
+	@go test -race $(PACKAGES)
 
 build-all: tools
 	rm -rf ./dist
 	gox -verbose \
-		-ldflags "-X main.version=${VERSION}" \
+		-ldflags "-s -w" \
+		-arch="amd64 386" \
 		-os="linux darwin windows" \
-		-arch="amd64 386 armv6 arm64" \
-		-osarch="!darwin/arm64" \
+		-osarch="!darwin/386" \
 		-output="dist/{{.OS}}-{{.Arch}}/{{.Dir}}" .
 
 dist: build-all
@@ -39,7 +39,7 @@ dist: build-all
 
 build-docker:
 	rm -f ./tm-monitor
-	docker run -it --rm -v "$(PWD):/go/src/github.com/tendermint/tools/tm-monitor" -w "/go/src/github.com/tendermint/tools/tm-monitor" -e "CGO_ENABLED=0" golang:alpine go build -ldflags "-X main.version=${VERSION}" -o tm-monitor
+	docker run -it --rm -v "$(PWD):/go/src/github.com/tendermint/tools/tm-monitor" -w "/go/src/github.com/tendermint/tools/tm-monitor" -e "CGO_ENABLED=0" golang:alpine go build -ldflags "-s -w" -o tm-monitor
 	docker build -t "tendermint/monitor" .
 
 clean: