diff --git a/package/Config.in b/package/Config.in
index d673f0616d..009f7ba186 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -327,6 +327,7 @@ comment "Graphic applications"
 	source "package/pngquant/Config.in"
 	source "package/qt5cinex/Config.in"
 	source "package/rrdtool/Config.in"
+	source "package/spirv-tools/Config.in"
 	source "package/stellarium/Config.in"
 	source "package/sway/Config.in"
 	source "package/swaybg/Config.in"
diff --git a/package/spirv-headers/spirv-headers.mk b/package/spirv-headers/spirv-headers.mk
index 3ab506e0db..ff43dfd8e9 100644
--- a/package/spirv-headers/spirv-headers.mk
+++ b/package/spirv-headers/spirv-headers.mk
@@ -4,6 +4,7 @@
 #
 ################################################################################
 
+# Keep in sync with spirv-tools version
 SPIRV_HEADERS_VERSION = 1.3.261.1
 SPIRV_HEADERS_SITE = $(call github,KhronosGroup,SPIRV-Headers,sdk-$(SPIRV_HEADERS_VERSION))
 SPIRV_HEADERS_LICENSE = MIT
diff --git a/package/spirv-tools/Config.in b/package/spirv-tools/Config.in
new file mode 100644
index 0000000000..e2f46253a9
--- /dev/null
+++ b/package/spirv-tools/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_SPIRV_TOOLS
+	bool "spirv-tools"
+	select BR2_PACKAGE_SPIRV_HEADERS
+	help
+	  The SPIR-V Tools project provides an API and commands for
+	  processing SPIR-V modules.
+
+	  https://github.com/KhronosGroup/SPIRV-Tools
diff --git a/package/spirv-tools/spirv-tools.hash b/package/spirv-tools/spirv-tools.hash
new file mode 100644
index 0000000000..65cb9c619b
--- /dev/null
+++ b/package/spirv-tools/spirv-tools.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  ead95c626ad482882a141d1aa0ce47b9453871f72c42c0b28d39c82f60a52008  spirv-tools-1.3.261.1.tar.gz
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/package/spirv-tools/spirv-tools.mk b/package/spirv-tools/spirv-tools.mk
new file mode 100644
index 0000000000..e863911b03
--- /dev/null
+++ b/package/spirv-tools/spirv-tools.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# spirv-tools
+#
+################################################################################
+
+# Keep in sync with spirv-headers version
+SPIRV_TOOLS_VERSION = 1.3.261.1
+SPIRV_TOOLS_SITE = $(call github,KhronosGroup,SPIRV-Tools,sdk-$(SPIRV_TOOLS_VERSION))
+SPIRV_TOOLS_LICENSE = Apache-2.0
+SPIRV_TOOLS_LICENSE_FILES = LICENSE
+SPIRV_TOOLS_DEPENDENCIES = spirv-headers
+SPIRV_TOOLS_INSTALL_STAGING = YES
+
+SPIRV_TOOLS_CONF_OPTS = \
+	-DSPIRV-Headers_SOURCE_DIR=$(STAGING_DIR)/usr \
+	-DSPIRV_TOOLS_BUILD_STATIC=OFF \
+	-DSPIRV_SKIP_TESTS=ON \
+	-DSPIRV_WERROR=OFF
+
+$(eval $(cmake-package))