diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile
index 284d42f2b3af..2b076c628940 100644
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	vulkan-validation-layers
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.262
 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
 
 USES=		alias cmake compiler:c++11-lib pkgconfig python:build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-ValidationLayers
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:headers/external/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:headers/layers/SPIRV-Headers
 CMAKE_OFF=	BUILD_TESTS
 CMAKE_ON=	BUILD_LAYER_SUPPORT_FILES
-CMAKE_ARGS=	-DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}"
 
 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
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/include/vulkan/external/vma
 
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt
index c96d097f56a7..56dc12c99336 100644
--- a/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt
+++ b/graphics/vulkan-validation-layers/files/patch-layers_CMakeLists.txt
@@ -1,27 +1,26 @@
 CMake Error at layers/CMakeLists.txt:114 (find_package):
   Could not find a package configuration file provided by "SPIRV-Headers"
   with any of the following names:
 
     SPIRV-HeadersConfig.cmake
     spirv-headers-config.cmake
 
   Add the installation prefix of "SPIRV-Headers" to CMAKE_PREFIX_PATH or set
   "SPIRV-Headers_DIR" to a directory containing one of the above files.  If
   "SPIRV-Headers" provides a separate development package or SDK, be sure it
   has been installed.
 
---- layers/CMakeLists.txt.orig	2023-01-20 04:42:25 UTC
+--- layers/CMakeLists.txt.orig	2023-08-29 03:23:36 UTC
 +++ layers/CMakeLists.txt
-@@ -111,7 +111,12 @@ add_library(VVL-SPIRV-LIBS INTERFACE)
+@@ -152,7 +152,10 @@ add_library(VVL-SPIRV-LIBS INTERFACE)
  # Represents all SPIRV libraries we need
  add_library(VVL-SPIRV-LIBS INTERFACE)
  
-+if (SPIRV_HEADERS_INSTALL_DIR)
-+add_library(SPIRV-Headers::SPIRV-Headers INTERFACE IMPORTED)
-+target_include_directories(SPIRV-Headers::SPIRV-Headers INTERFACE ${SPIRV_HEADERS_INSTALL_DIR}/include)
-+else()
- find_package(SPIRV-Headers REQUIRED CONFIG QUIET)
+-find_package(SPIRV-Headers REQUIRED CONFIG QUIET)
++find_package(SPIRV-Headers CONFIG QUIET)
++if (NOT TARGET SPIRV-Headers::SPIRV-Headers)
++    add_subdirectory(SPIRV-Headers EXCLUDE_FROM_ALL SYSTEM)
 +endif()
  target_link_libraries(VVL-SPIRV-LIBS INTERFACE SPIRV-Headers::SPIRV-Headers)
  
  find_package(SPIRV-Tools-opt REQUIRED CONFIG QUIET)