diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile
index a274a89d4fbf..0056755262e5 100644
--- a/graphics/spirv-tools/Makefile
+++ b/graphics/spirv-tools/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	spirv-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2024.4.rc1
+DISTVERSION=	2024.4.rc2
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Tools for processing SPIR-V intermediate shader language modules
 WWW=		https://github.com/KhronosGroup/SPIRV-Tools
 
 LICENSE=	APACHE20
 
 USES=		cmake compiler:c++11-lib python:build shebangfix
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	tools/lesspipe/spirv-lesspipe.sh
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	SPIRV-Tools
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-372-g2a9b6f9:headers/external/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-386-g3f17b2a:headers/external/spirv-headers
 
 CMAKE_ON=	SPIRV_SKIP_TESTS
 
 .include <bsd.port.mk>
diff --git a/graphics/spirv-tools/distinfo b/graphics/spirv-tools/distinfo
index d4c20f80a0f2..c95c530ed215 100644
--- a/graphics/spirv-tools/distinfo
+++ b/graphics/spirv-tools/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1726774098
-SHA256 (KhronosGroup-SPIRV-Tools-v2024.4.rc1_GH0.tar.gz) = 7f44b9bc780a5b8c54637b722e4f9f2a2b7dd04840a79890dd4bcf615faf6b0c
-SIZE (KhronosGroup-SPIRV-Tools-v2024.4.rc1_GH0.tar.gz) = 3194161
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-372-g2a9b6f9_GH0.tar.gz) = 273e5613654c0ee1546f6171ef755ccd3cfa909155a71021ac486f32162ba18a
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-372-g2a9b6f9_GH0.tar.gz) = 523898
+TIMESTAMP = 1733411852
+SHA256 (KhronosGroup-SPIRV-Tools-v2024.4.rc2_GH0.tar.gz) = b63b0ceda2350a4d097f41d52e929eddeadb8cae05b979989da364f1012727b0
+SIZE (KhronosGroup-SPIRV-Tools-v2024.4.rc2_GH0.tar.gz) = 3201805
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-386-g3f17b2a_GH0.tar.gz) = a9e990c5e1170acee5cc92e6fe6444aa4461febbdb02294dc8551bfa1e421c49
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-386-g3f17b2a_GH0.tar.gz) = 532243
diff --git a/graphics/spirv-tools/pkg-plist b/graphics/spirv-tools/pkg-plist
index 92dd75e0ea20..974cf735bcdd 100644
--- a/graphics/spirv-tools/pkg-plist
+++ b/graphics/spirv-tools/pkg-plist
@@ -1,45 +1,44 @@
 bin/spirv-as
 bin/spirv-cfg
 bin/spirv-dis
 bin/spirv-lesspipe.sh
 bin/spirv-link
 bin/spirv-lint
 bin/spirv-objdump
 bin/spirv-opt
 bin/spirv-reduce
 bin/spirv-val
-include/spirv-tools/instrument.hpp
 include/spirv-tools/libspirv.h
 include/spirv-tools/libspirv.hpp
 include/spirv-tools/linker.hpp
 include/spirv-tools/optimizer.hpp
 lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffConfig.cmake
 lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools-diff/SPIRV-Tools-diffTargets.cmake
 lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake
 lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake
 lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintConfig.cmake
 lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools-lint/SPIRV-Tools-lintTargets.cmake
 lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake
 lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake
 lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake
 lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake
 lib/cmake/SPIRV-Tools-tools/SPIRV-Tools-toolsConfig.cmake
 lib/cmake/SPIRV-Tools-tools/SPIRV-Tools-toolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools-tools/SPIRV-Tools-toolsTargets.cmake
 lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake
 lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake
 lib/libSPIRV-Tools-diff.a
 lib/libSPIRV-Tools-link.a
 lib/libSPIRV-Tools-lint.a
 lib/libSPIRV-Tools-opt.a
 lib/libSPIRV-Tools-reduce.a
 lib/libSPIRV-Tools-shared.so
 lib/libSPIRV-Tools.a
 libdata/pkgconfig/SPIRV-Tools-shared.pc
 libdata/pkgconfig/SPIRV-Tools.pc