diff --git a/Makefile b/Makefile
index 82129623d4..fe28e98484 100644
--- a/Makefile
+++ b/Makefile
@@ -336,6 +336,16 @@ ifneq ($(SKIP_TESTS), 1)
 	@hack/lint.sh
 endif
 
+lint-fix:
+ifneq ($(SKIP_TESTS), 1)
+	@$(MAKE) shell CMD="-c 'hack/lint.sh fix'"
+endif
+
+local-lint-fix:
+ifneq ($(SKIP_TESTS), 1)
+	@hack/lint.sh fix
+endif
+
 update:
 	@$(MAKE) shell CMD="-c 'hack/update-all.sh'"
 
diff --git a/hack/lint.sh b/hack/lint.sh
index 737a6d6750..6b6cdec08c 100755
--- a/hack/lint.sh
+++ b/hack/lint.sh
@@ -20,6 +20,12 @@ golangci-lint cache status
 # Enable GL_DEBUG line below for debug messages for golangci-lint
 # export GL_DEBUG=loader,gocritic,env
 CMD="golangci-lint run"
+
+# Add --fix flag if first argument is "fix"
+if [ "$1" = "fix" ]; then
+    CMD="$CMD --fix"
+fi
+
 echo "Running $CMD"
 
 eval $CMD