diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92fdc34be..568393662 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Added a `lint:fix` script to auto-fix ESLint issues across workspaces. [#XXXX](https://github.com/sourcebot-dev/sourcebot/pull/1510)
+
 ### Changed
 - Vulnerability triage now keeps Linear issues synchronized with current security findings.
 
diff --git a/package.json b/package.json
index cd7437ecd..e1c3b9bce 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
         "build": "cross-env SKIP_ENV_VALIDATION=1 yarn workspaces foreach --all --topological run build",
         "test": "yarn workspaces foreach --all --topological run test",
         "lint": "yarn workspaces foreach --all --topological run lint",
+	"lint:fix": "yarn workspaces foreach --all --topological run lint:fix",
         "dev": "concurrently --kill-others --names \"zoekt,worker,web,schemas\" 'yarn dev:zoekt' 'yarn dev:backend' 'yarn dev:web' 'yarn watch:schemas'",
         "with-env": "cross-env PATH=\"$PWD/bin:$PATH\" dotenv -e .env.development -c --",
         "dev:zoekt": "yarn with-env zoekt-webserver -index .sourcebot/index -rpc",
diff --git a/packages/web/package.json b/packages/web/package.json
index 280de50b2..bb5d9b570 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -7,6 +7,7 @@
     "build": "cross-env SKIP_ENV_VALIDATION=1 next build",
     "start": "next start",
     "lint": "cross-env SKIP_ENV_VALIDATION=1 eslint .",
+    "lint:fix": "cross-env SKIP_ENV_VALIDATION=1 eslint . --fix",
     "test": "cross-env SKIP_ENV_VALIDATION=1 vitest",
     "openapi:generate": "tsx tools/generateOpenApi.ts",
     "generate:protos": "proto-loader-gen-types --includeComments --longs=Number --enums=String --defaults --oneofs --grpcLib=@grpc/grpc-js --keepCase --includeDirs=../../vendor/zoekt/grpc/protos --outDir=src/proto zoekt/webserver/v1/webserver.proto zoekt/webserver/v1/query.proto",