diff --git a/graphics/spirv-tools/Makefile b/graphics/spirv-tools/Makefile
index 0056755262e5..d2a77f69c38e 100644
--- a/graphics/spirv-tools/Makefile
+++ b/graphics/spirv-tools/Makefile
@@ -1,23 +1,27 @@
 PORTNAME=	spirv-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2024.4.rc2
+PORTREVISION=	1
 CATEGORIES=	graphics
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	066c3d52c2fc.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/5951
+
 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-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 c95c530ed215..b54063c08296 100644
--- a/graphics/spirv-tools/distinfo
+++ b/graphics/spirv-tools/distinfo
@@ -1,5 +1,7 @@
 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
+SHA256 (066c3d52c2fc.patch) = 9f76671e0ff90f00d736b191bad957a743d5ea1b1b46ff6b444703735869e73b
+SIZE (066c3d52c2fc.patch) = 8784
diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile
index e2784572c6e6..81cc4974ca62 100644
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@@ -1,46 +1,40 @@
 PORTNAME=	vulkan-validation-layers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.305
+DISTVERSION=	1.4.306
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Validation layers for the Vulkan graphics API
 WWW=		https://github.com/KhronosGroup/Vulkan-ValidationLayers
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	robin-hood-hashing>0:devel/robin-hood-hashing \
 		spirv-tools>0:graphics/spirv-tools \
 		vulkan-headers>0:graphics/vulkan-headers \
 		vulkan-utility-libraries>0:graphics/vulkan-utility-libraries
 
 USES=		alias cmake compiler:c++11-lib pkgconfig python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-ValidationLayers
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-386-g3f17b2a:headers/SPIRV-Headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-390-g2b2e05e:headers/SPIRV-Headers
 CMAKE_OFF=	BUILD_TESTS
 
-.if ${DISTVERSION:E} < 306
-GH_TUPLE+=	KhronosGroup:Vulkan-Headers:${DISTVERSIONFULL}:vkheaders/Vulkan-Headers \
-		KhronosGroup:Vulkan-Utility-Libraries:${DISTVERSIONFULL}:vkutils/Vulkan-Utility-Libraries
-CFLAGS+=	-I${WRKSRC_vkheaders}/include -I${WRKSRC_vkutils}/include
-.endif
-
 OPTIONS_DEFINE=	WAYLAND XCB XLIB
 OPTIONS_DEFAULT=WAYLAND XCB XLIB
 
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
 WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
 
 XCB_DESC=		${X11_DESC} via libxcb
 XCB_USES=		xorg
 XCB_USE=		XORG=xcb
 XCB_CMAKE_BOOL=		BUILD_WSI_XCB_SUPPORT
 
 XLIB_DESC=		${X11_DESC} via libX11
 XLIB_USES=		xorg
 XLIB_USE=		XORG=x11,xrandr
 XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
 
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo
index 5fe52fab6ecd..822dbfde28af 100644
--- a/graphics/vulkan-validation-layers/distinfo
+++ b/graphics/vulkan-validation-layers/distinfo
@@ -1,9 +1,5 @@
-TIMESTAMP = 1737144823
-SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.4.305_GH0.tar.gz) = cda4e89f54afa7ededbe73a41a30ce51306418e7cbf2635bfa0222c40d362656
-SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.4.305_GH0.tar.gz) = 5952955
-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
-SHA256 (KhronosGroup-Vulkan-Headers-v1.4.305_GH0.tar.gz) = 7581c5ed0337ffeef0707651561f722700081bc69c62c582c470cd77c2be0920
-SIZE (KhronosGroup-Vulkan-Headers-v1.4.305_GH0.tar.gz) = 2448757
-SHA256 (KhronosGroup-Vulkan-Utility-Libraries-v1.4.305_GH0.tar.gz) = 38a0b848ffe244c86162fd3d09506133057cc5341efc986f6289b2306061f891
-SIZE (KhronosGroup-Vulkan-Utility-Libraries-v1.4.305_GH0.tar.gz) = 573371
+TIMESTAMP = 1737745396
+SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.4.306_GH0.tar.gz) = 9756a34e206e8d1fff4dfb951d46536ab2eb14e12bcdafbb79202155ec48c1a9
+SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.4.306_GH0.tar.gz) = 5969863
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-390-g2b2e05e_GH0.tar.gz) = fc797809e39dc71ed62a5384198ab0746b1d8348aaf76801dfe721ec922edc22
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-390-g2b2e05e_GH0.tar.gz) = 535982