diff --git a/go/BUILD.bazel b/go/BUILD.bazel
index 936c86e0ed1..931f061da9e 100644
--- a/go/BUILD.bazel
+++ b/go/BUILD.bazel
@@ -47,6 +47,7 @@ codeql_pkg_files(
         "//go/extractor/cli/go-autobuilder",
         "//go/extractor/cli/go-bootstrap",
         "//go/extractor/cli/go-build-runner",
+        "//go/extractor/cli/go-configure-baseline",
         "//go/extractor/cli/go-extractor",
         "//go/extractor/cli/go-gen-dbscheme",
         "//go/extractor/cli/go-tokenizer",
diff --git a/go/codeql-tools/baseline-config-empty.json b/go/codeql-tools/baseline-config-empty.json
deleted file mode 100644
index 568d688fc3f..00000000000
--- a/go/codeql-tools/baseline-config-empty.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "paths-ignore": []
-}
\ No newline at end of file
diff --git a/go/codeql-tools/baseline-config-vendor.json b/go/codeql-tools/baseline-config-vendor.json
deleted file mode 100644
index d2f654073b0..00000000000
--- a/go/codeql-tools/baseline-config-vendor.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "paths-ignore": [
-        "vendor/**"
-    ]
-}
\ No newline at end of file
diff --git a/go/codeql-tools/configure-baseline.cmd b/go/codeql-tools/configure-baseline.cmd
index 285c3d66829..03edd525f3e 100644
--- a/go/codeql-tools/configure-baseline.cmd
+++ b/go/codeql-tools/configure-baseline.cmd
@@ -1,6 +1,7 @@
 @echo off
-if exist vendor\modules.txt (
-  type "%CODEQL_EXTRACTOR_GO_ROOT%\tools\baseline-config-vendor.json"
-) else (
-  type "%CODEQL_EXTRACTOR_GO_ROOT%\tools\baseline-config-empty.json"
-)
+SETLOCAL EnableDelayedExpansion
+
+type NUL && "%CODEQL_EXTRACTOR_GO_ROOT%/tools/%CODEQL_PLATFORM%/go-configure-baseline.exe"
+exit /b %ERRORLEVEL%
+
+ENDLOCAL
diff --git a/go/codeql-tools/configure-baseline.sh b/go/codeql-tools/configure-baseline.sh
index f426773c3ba..20edf8b4c93 100755
--- a/go/codeql-tools/configure-baseline.sh
+++ b/go/codeql-tools/configure-baseline.sh
@@ -1,7 +1,3 @@
 #!/bin/sh
 
-if [ -f vendor/modules.txt ]; then
-  cat "$CODEQL_EXTRACTOR_GO_ROOT/tools/baseline-config-vendor.json"
-else
-  cat "$CODEQL_EXTRACTOR_GO_ROOT/tools/baseline-config-empty.json"
-fi
+"$CODEQL_EXTRACTOR_GO_ROOT/tools/$CODEQL_PLATFORM/go-configure-baseline"
diff --git a/go/extractor/cli/go-configure-baseline/BUILD.bazel b/go/extractor/cli/go-configure-baseline/BUILD.bazel
new file mode 100644
index 00000000000..df1af64d6a3
--- /dev/null
+++ b/go/extractor/cli/go-configure-baseline/BUILD.bazel
@@ -0,0 +1,18 @@
+# generated running `bazel run //go/gazelle`, do not edit
+
+load("@rules_go//go:def.bzl", "go_library")
+load("//go:rules.bzl", "codeql_go_binary")
+
+go_library(
+    name = "go-configure-baseline_lib",
+    srcs = ["go-configure-baseline.go"],
+    importpath = "github.com/github/codeql-go/extractor/cli/go-configure-baseline",
+    visibility = ["//visibility:private"],
+    deps = ["//go/extractor/configurebaseline"],
+)
+
+codeql_go_binary(
+    name = "go-configure-baseline",
+    embed = [":go-configure-baseline_lib"],
+    visibility = ["//visibility:public"],
+)
diff --git a/go/extractor/cli/go-configure-baseline/go-configure-baseline.go b/go/extractor/cli/go-configure-baseline/go-configure-baseline.go
new file mode 100644
index 00000000000..b7f88230267
--- /dev/null
+++ b/go/extractor/cli/go-configure-baseline/go-configure-baseline.go
@@ -0,0 +1,14 @@
+package main
+
+import (
+	"github.com/github/codeql-go/extractor/configurebaseline"
+)
+
+func main() {
+	jsonResult, err := configurebaseline.GetConfigBaselineAsJSON(".")
+	if err != nil {
+		panic(err)
+	} else {
+		println(string(jsonResult))
+	}
+}
diff --git a/go/extractor/configurebaseline/BUILD.bazel b/go/extractor/configurebaseline/BUILD.bazel
new file mode 100644
index 00000000000..7c5161683f5
--- /dev/null
+++ b/go/extractor/configurebaseline/BUILD.bazel
@@ -0,0 +1,10 @@
+# generated running `bazel run //go/gazelle`, do not edit
+
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "configurebaseline",
+    srcs = ["configurebaseline.go"],
+    importpath = "github.com/github/codeql-go/extractor/configurebaseline",
+    visibility = ["//visibility:public"],
+)
diff --git a/go/extractor/configurebaseline/configurebaseline.go b/go/extractor/configurebaseline/configurebaseline.go
new file mode 100644
index 00000000000..b8bab4eeb95
--- /dev/null
+++ b/go/extractor/configurebaseline/configurebaseline.go
@@ -0,0 +1,48 @@
+package configurebaseline
+
+import (
+	"encoding/json"
+	"io/fs"
+	"os"
+	"path"
+	"path/filepath"
+)
+
+func fileExists(path string) bool {
+	stat, err := os.Stat(path)
+	return err == nil && stat.Mode().IsRegular()
+}
+
+func isGolangVendorDirectory(dirPath string) bool {
+	// Call a directory a Golang vendor directory if it contains a modules.txt file.
+	return path.Base(dirPath) == "vendor" && fileExists(path.Join(dirPath, "modules.txt"))
+}
+
+type PathsIgnoreStruct struct {
+	PathsIgnore []string `json:"paths-ignore"`
+}
+
+func GetConfigBaselineAsJSON(rootDir string) ([]byte, error) {
+	vendorDirs := make([]string, 0)
+
+	// If CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS is "true":
+	if os.Getenv("CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS") == "true" {
+		// The user wants vendor directories scanned; emit an empty report.
+	} else {
+		filepath.WalkDir(rootDir, func(dirPath string, d fs.DirEntry, err error) error {
+			if err != nil {
+				// Mask any unreadable paths.
+				return nil
+			}
+			if isGolangVendorDirectory(dirPath) {
+				vendorDirs = append(vendorDirs, path.Join(dirPath, "**"))
+				return filepath.SkipDir
+			} else {
+				return nil
+			}
+		})
+	}
+
+	outputStruct := PathsIgnoreStruct{PathsIgnore: vendorDirs}
+	return json.Marshal(outputStruct)
+}