diff --git a/Makefile b/Makefile
index 4ba546a..891a9ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+LINT_ARGS ?= ./...
 export GO111MODULE := on
 
 build: bin/server
@@ -13,7 +14,7 @@ test: tidy
 	go test -mod=vendor -v ./...
 
 lint:
-	@PATH=$(PATH):./bin/gometalinter gometalinter -e '.*/pkg/mod' -e ".*/go/src" --vendor $(LINT_ARGS) ./...
+	@golangci-lint run -e '.*/pkg/mod' -e ".*/go/src" --enable-all $(LINT_ARGS)
 
 tidy:
 	go mod tidy
@@ -24,8 +25,8 @@ vendor: tidy
 install-devtools: vendor
 	# Install modd
 	GO111MODULE=off go get -u github.com/cortesi/modd/cmd/modd
-	# Install Gometalinter
-	bash misc/gometalinter/install.sh -b ./bin/gometalinter
+	# Install golangci-lint
+	GO111MODULE=off go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 
 clean:
 	rm -rf ./bin