diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile
index c10fe0b6c205..5cfd84022dc6 100644
--- a/graphics/shaderc/Makefile
+++ b/graphics/shaderc/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	shaderc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2021.2
+DISTVERSION=	2021.3
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	GLSL/HLSL to SPIR-V shader compiler
 
 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:3.4+,build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	google
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-47-gdafead1:headers/third_party/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-123-g814e728:headers/third_party/spirv-headers
 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 5d2b122dcec2..76991dc9dc81 100644
--- a/graphics/shaderc/distinfo
+++ b/graphics/shaderc/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1629928721
-SHA256 (google-shaderc-v2021.2_GH0.tar.gz) = d0d75beced49c7a03ae30bb4a879a3c7f2218ad66af19a115f665d07f37167ba
-SIZE (google-shaderc-v2021.2_GH0.tar.gz) = 221393
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-47-gdafead1_GH0.tar.gz) = e38cdf41c089a0688b2024a873d20f84fa259af713ad52430b4d119b5f5380a6
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-47-gdafead1_GH0.tar.gz) = 405883
+TIMESTAMP = 1636654438
+SHA256 (google-shaderc-v2021.3_GH0.tar.gz) = d05f646c363e6447f233126b196238d9022a1dca1bf98f766511aa1a58320972
+SIZE (google-shaderc-v2021.3_GH0.tar.gz) = 221509
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = e4880dccda018f63cdc684afd5e51972d8ad2e3f21e9bab346a865370ea2929e
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = 416402