diff --git a/Makefile b/Makefile
index 243797757e..f21e4a7c0a 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ test:
 	@echo "Run unit tests"
 	@$(GOTEST) ./pkg/... -coverprofile=coverage.txt -covermode=atomic && echo "\nUnit tests run successfully!"
 
-check-all: lint check-static check-shadow check-gosec megacheck errcheck
+check-all: lint check-static check-shadow check-gosec staticcheck errcheck
 
 check-setup:
 	@which retool >/dev/null 2>&1 || go get github.com/twitchtv/retool
@@ -99,11 +99,11 @@ check-static:
 	  --enable ineffassign \
 	  $$($(PACKAGE_DIRECTORIES))
 
-# TODO: megacheck is too slow currently
-megacheck:
-	@echo "gometalinter megacheck"
+# TODO: staticcheck is too slow currently
+staticcheck:
+	@echo "gometalinter staticcheck"
 	CGO_ENABLED=0 retool do gometalinter.v2 --disable-all --deadline 120s \
-	  --enable megacheck \
+	  --enable staticcheck \
 	  $$($(PACKAGE_DIRECTORIES))
 
 # TODO: errcheck is too slow currently
diff --git a/tools.json b/tools.json
index a073d1763a..0f1c4e27f5 100644
--- a/tools.json
+++ b/tools.json
@@ -13,8 +13,8 @@
       "Commit": "7bae11eba15a3285c75e388f77eb6357a2d73ee2"
     },
     {
-      "Repository": "honnef.co/go/tools/cmd/megacheck",
-      "Commit": "88497007e8588ea5b6baee991f74a1607e809487"
+      "Repository": "honnef.co/go/tools/cmd/staticcheck",
+      "Commit": "5a4a2f4a438d01ba03c591f88ef312005a05063b"
     },
     {
       "Repository": "github.com/kisielk/errcheck",