diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile
index 0df8736c4711..da91d9202bec 100644
--- a/graphics/shaderc/Makefile
+++ b/graphics/shaderc/Makefile
@@ -1,41 +1,43 @@
 PORTNAME=	shaderc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2023.7
+DISTVERSION=	2023.8
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	GLSL/HLSL to SPIR-V shader compiler
 WWW=		https://github.com/google/shaderc
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	glslang>0:graphics/glslang \
 		spirv-tools>0:graphics/spirv-tools
 TEST_DEPENDS=	googletest>0:devel/googletest
 
-USES=		cmake:testing compiler:c++11-lib localbase:ldflags python:build
+USES=		cmake:testing compiler:c++11-lib localbase:ldflags \
+		python:build shebangfix
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	google
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-324-g4183b26:headers/third_party/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-332-g1c6bb27:headers/third_party/spirv-headers
+SHEBANG_FILES=	utils/add_copyright.py
 CMAKE_ON+=	${CMAKE_TESTING_OFF}
 CMAKE_TESTING_OFF=	SHADERC_SKIP_TESTS
 CMAKE_ARGS=	-Dglslang_SOURCE_DIR:PATH="${LOCALBASE}/include/glslang" \
 		-DSPIRV-Headers_SOURCE_DIR:PATH="${WRKSRC}/third_party/spirv-headers"
 LDFLAGS+=	-Wl,-z,defs # glslang
 
 post-patch:
 # Disable bundled dependencies
 	${REINPLACE_CMD} '/third_party/d' ${WRKSRC}/CMakeLists.txt
 # Unbreak tests with system spirv-tools
 	${REINPLACE_CMD} 's,\$$<TARGET_FILE:\(spirv-dis\)>,\1,' \
 		${WRKSRC}/glslc/test/CMakeLists.txt
 
 pre-configure:
 # Extract (snapshot) version from the port instead of CHANGES + .git/
 	${REINPLACE_CMD} '/build-version/d' ${WRKSRC}/glslc/CMakeLists.txt
 	${ECHO_CMD} "\"${PORTNAME} ${DISTVERSIONFULL}\n\"" >> ${WRKSRC}/glslc/src/build-version.inc
 	${ECHO_CMD} "\"`${PKG_BIN} query '%n v%v' spirv-tools`\n\"" >> ${WRKSRC}/glslc/src/build-version.inc
 	${ECHO_CMD} "\"`${PKG_BIN} query '%n %v' glslang`\n\"" >> ${WRKSRC}/glslc/src/build-version.inc
 
 .include <bsd.port.mk>
diff --git a/graphics/shaderc/distinfo b/graphics/shaderc/distinfo
index 41e20cec93ce..0b6dc644b614 100644
--- a/graphics/shaderc/distinfo
+++ b/graphics/shaderc/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1697209337
-SHA256 (google-shaderc-v2023.7_GH0.tar.gz) = 681e1340726a0bf46bea7e31f10cbfe78e01e4446a35d90fedc2b78d400fcdeb
-SIZE (google-shaderc-v2023.7_GH0.tar.gz) = 227360
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-324-g4183b26_GH0.tar.gz) = ab95213d9ab8b61db2954d88d3a6e6b44d14c5cc55a163103766ebe6afd15616
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-324-g4183b26_GH0.tar.gz) = 466064
+TIMESTAMP = 1704303900
+SHA256 (google-shaderc-v2023.8_GH0.tar.gz) = dfec5045f30d8f6d3d3914ab5b3cc2695947f266d41261b1459177cd789308d1
+SIZE (google-shaderc-v2023.8_GH0.tar.gz) = 227238
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-332-g1c6bb27_GH0.tar.gz) = d5aa6bb24f14dc0ec6785cb03826b3e10194e8d168930d7cdec5826536d43ea1
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-332-g1c6bb27_GH0.tar.gz) = 466608
diff --git a/graphics/shaderc/files/patch-system-glslang b/graphics/shaderc/files/patch-system-glslang
index 5d908506bfc0..71447f9e3410 100644
--- a/graphics/shaderc/files/patch-system-glslang
+++ b/graphics/shaderc/files/patch-system-glslang
@@ -1,36 +1,36 @@
 ld: error: undefined symbol: spvBinaryDestroy
 >>> referenced by shaderc.cc
 >>>               shaderc.cc.o:(shaderc_compilation_result_spv_binary::~shaderc_compilation_result_spv_binary()) in archive libshaderc/./libshaderc_combined.a
 >>> referenced by shaderc.cc
 >>>               shaderc.cc.o:(shaderc_compilation_result_spv_binary::~shaderc_compilation_result_spv_binary()) in archive libshaderc/./libshaderc_combined.a
 ld: error: undefined symbol: glslang::InitializeProcess()
 >>> referenced by compiler.cc
 >>>               compiler.cc.o:(shaderc_util::GlslangInitializer::GlslangInitializer()) in archive libshaderc_util/libshaderc_util.a
 ld: error: undefined symbol: ConstructCompiler(EShLanguage, int)
 >>> referenced by ShaderLang.cpp
 >>>               ShaderLang.cpp.o:(ShConstructCompiler) in archive /usr/local/lib/libMachineIndependent.a
 
 --- libshaderc/CMakeLists.txt.orig	2020-12-09 21:30:21 UTC
 +++ libshaderc/CMakeLists.txt
 @@ -114,7 +114,7 @@ endif(SHADERC_ENABLE_INSTALL)
  
  shaderc_add_tests(
    TEST_PREFIX shaderc_combined
 -  LINK_LIBS shaderc_combined ${CMAKE_THREAD_LIBS_INIT}
 +  LINK_LIBS shaderc_combined ${SHADERC_LIBS}
    INCLUDE_DIRS include ${shaderc_SOURCE_DIR}/libshaderc_util/include ${glslang_SOURCE_DIR}
                 ${spirv-tools_SOURCE_DIR}/include
                 ${SPIRV-Headers_SOURCE_DIR}/include
---- libshaderc_util/CMakeLists.txt.orig	2020-12-09 21:30:21 UTC
+--- libshaderc_util/CMakeLists.txt.orig	2024-01-03 17:45:00 UTC
 +++ libshaderc_util/CMakeLists.txt
-@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL)
+@@ -46,8 +46,8 @@ target_link_libraries(shaderc_util PRIVATE
  
  find_package(Threads)
  target_link_libraries(shaderc_util PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV
+-  glslang SPIRV
 -  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-+  glslang MachineIndependent GenericCodeGen OSDependent OGLCompiler HLSL glslang SPIRV
++  glslang MachineIndependent GenericCodeGen SPIRV
 +  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
  
  shaderc_add_tests(
    TEST_PREFIX shaderc_util