diff --git a/Makefile b/Makefile
index 0860d71f7d..4c6cef5fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ fix: build
 	$(GOPATH1)/bin/algofix */
 
 lint: deps
-	$(GOPATH1)/bin/golint ./...
+	$(GOPATH1)/bin/golangci-lint run -c .golangci.yml 
 
 vet:
 	go vet ./...
diff --git a/scripts/buildtools/install_buildtools.sh b/scripts/buildtools/install_buildtools.sh
index 2e0db63537..e63802d72b 100755
--- a/scripts/buildtools/install_buildtools.sh
+++ b/scripts/buildtools/install_buildtools.sh
@@ -93,3 +93,4 @@ install_go_module github.com/go-swagger/go-swagger github.com/go-swagger/go-swag
 install_go_module github.com/algorand/msgp
 install_go_module gotest.tools/gotestsum
 install_go_module github.com/algorand/oapi-codegen github.com/algorand/oapi-codegen/cmd/oapi-codegen
+install_go_module github.com/golangci/golangci-lint/cmd/golangci-lint
diff --git a/scripts/buildtools/versions b/scripts/buildtools/versions
index c5a247b036..8124bb8e0b 100644
--- a/scripts/buildtools/versions
+++ b/scripts/buildtools/versions
@@ -4,3 +4,4 @@ github.com/algorand/msgp v1.1.52
 github.com/algorand/oapi-codegen v1.3.7
 github.com/go-swagger/go-swagger v0.25.0
 gotest.tools/gotestsum v1.6.4
+github.com/golangci/golangci-lint/cmd/golangci-lint v1.41.1
diff --git a/scripts/check_deps.sh b/scripts/check_deps.sh
index 4752108a29..a3807c39b4 100755
--- a/scripts/check_deps.sh
+++ b/scripts/check_deps.sh
@@ -38,6 +38,7 @@ GO_DEPS=(
     "$GO_BIN/golint"
     "$GO_BIN/stringer"
     "$GO_BIN/msgp"
+    "$GO_BIN/golangci-lint"
 )
 
 check_deps() {