diff --git a/Makefile b/Makefile
index d80410ff1..9e7039711 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,33 @@
-.PHONY: all test get_deps
+.PHONY: all test fmt lint get_deps
 
 all: protoc install test
 
 NOVENDOR = go list github.com/tendermint/abci/... | grep -v /vendor/
 
 protoc:
-	protoc --go_out=plugins=grpc:. types/*.proto
+	@ protoc --go_out=plugins=grpc:. types/*.proto
 
 install:
-	go install github.com/tendermint/abci/cmd/...
+	@ go install github.com/tendermint/abci/cmd/...
 
 test:
-	go test `${NOVENDOR}`
-	bash tests/test.sh
+	@ go test `${NOVENDOR}`
+	@ bash tests/test.sh
+
+fmt:
+	@ go fmt ./...
+
+lint:
+	@ go get -u github.com/golang/lint/golint
+	@ for file in $$(find "." -name '*.go' | grep -v '/vendor/' | grep -v '\.pb\.go'); do \
+		golint -set_exit_status $${file}; \
+	done;
 
 test_integrations: get_vendor_deps install test
 
 get_deps:
-	go get -d `${NOVENDOR}`
+	@ go get -d `${NOVENDOR}`
 
 get_vendor_deps:
-	go get github.com/Masterminds/glide
-	glide install
+	@ go get github.com/Masterminds/glide
+	@ glide install