diff --git a/Makefile b/Makefile
index e020fba76f3..6919817f54e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,13 @@ all: build
 build:
 	go build -o bin/grafana .
 
+lint:
+	@gofmt -w . && go tool vet pkg/**/*.go && echo "$(GOLINT)"
+
 setup:
 	go get github.com/tools/godep
+	go install github.com/mattn/go-sqlite3
+
+