diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile
index 17330a19b973..c8c6e14c9957 100644
--- a/graphics/spirv-tools/Makefile
+++ b/graphics/spirv-tools/Makefile
@@ -1,30 +1,23 @@
 PORTNAME=	spirv-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2023.2
-PORTREVISION=	3
+DISTVERSION=	2023.4.rc1
 CATEGORIES=	graphics
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	d4c0abdcad60.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/5178
-PATCHFILES+=	0ce36ad7856e.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/5178
-PATCHFILES+=	d33bea584707.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/5257
-PATCHFILES+=	daee1e7d3470.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/5274
-
 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-245-g1feaf44:headers/external/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-292-gf1ba373: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 6d88b1cb9900..effdbd4d5b13 100644
--- a/graphics/spirv-tools/distinfo
+++ b/graphics/spirv-tools/distinfo
@@ -1,13 +1,5 @@
-TIMESTAMP = 1678703638
-SHA256 (KhronosGroup-SPIRV-Tools-v2023.2_GH0.tar.gz) = 7416cc8a98a10c32bacc36a39930b0c5b2a484963df5d68f388ed7ffee1faad3
-SIZE (KhronosGroup-SPIRV-Tools-v2023.2_GH0.tar.gz) = 3101345
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-245-g1feaf44_GH0.tar.gz) = bf505456fb2fdd30af51dfe292a6688cf6a54f6a8a2e3a9479cf6895c93b362b
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-245-g1feaf44_GH0.tar.gz) = 450276
-SHA256 (d4c0abdcad60.patch) = 1c90a90b12005fae60baa736e84c76006f88ee2c572332a8851cb7e62338c624
-SIZE (d4c0abdcad60.patch) = 146761
-SHA256 (0ce36ad7856e.patch) = 14b657e86ae5917cb9103956215a39ba70f3894e468aae16fd49e2830923c506
-SIZE (0ce36ad7856e.patch) = 111883
-SHA256 (d33bea584707.patch) = a5119d7c7e6748820bad1309a1dc74b2f1011d14fae7582bd53c45c6f5290506
-SIZE (d33bea584707.patch) = 16636
-SHA256 (daee1e7d3470.patch) = 4d1ce2692612b8abee0765a0efa3b6375426202f58cb34fda207c5d898a076dd
-SIZE (daee1e7d3470.patch) = 294137
+TIMESTAMP = 1689627668
+SHA256 (KhronosGroup-SPIRV-Tools-v2023.4.rc1_GH0.tar.gz) = cf479159e4ceedadd3fbbae7994a42a9708a2212f8a4618c0d63d8ebbf234016
+SIZE (KhronosGroup-SPIRV-Tools-v2023.4.rc1_GH0.tar.gz) = 3129086
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-292-gf1ba373_GH0.tar.gz) = 6f5b094cf2176e4838212526f44e6d5d06609891d4d53a4cc5635454a2a2146a
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-292-gf1ba373_GH0.tar.gz) = 456261
diff --git a/graphics/spirv-tools/pkg-plist b/graphics/spirv-tools/pkg-plist
index 876767a694a3..92dd75e0ea20 100644
--- a/graphics/spirv-tools/pkg-plist
+++ b/graphics/spirv-tools/pkg-plist
@@ -1,44 +1,45 @@
 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