diff --git a/var/spack/repos/builtin/packages/goimports/package.py b/var/spack/repos/builtin/packages/goimports/package.py
new file mode 100644
index 00000000000..2c799cfde53
--- /dev/null
+++ b/var/spack/repos/builtin/packages/goimports/package.py
@@ -0,0 +1,21 @@
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class Goimports(GoPackage):
+    """Updates your Go import lines, adding missing ones and removing unreferenced ones."""
+
+    homepage = "https://golang.org/x/tools/cmd/goimports"
+    url = "https://github.com/golang/tools/archive/refs/tags/v0.25.0.tar.gz"
+
+    maintainers("alecbcs")
+
+    license("BSD-3-Clause", checked_by="alecbcs")
+
+    version("0.25.0", sha256="c536188f5db744371f526f3059960945ed580b3ee60553a4f01956251ab36d20")
+
+    build_directory = "cmd/goimports"