diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile
index fe51634cf61b..940d75303226 100644
--- a/graphics/vulkan-headers/Makefile
+++ b/graphics/vulkan-headers/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	vulkan-headers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.258
+DISTVERSION=	1.3.259
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Headers for the Vulkan graphics API
 WWW=		https://github.com/KhronosGroup/Vulkan-Headers
 
 LICENSE=	APACHE20
 
 USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-Headers
 STRIP=		# nothing to strip
 NO_ARCH=	yes
 
 post-extract:
 # genvk.py requires docgenerator.py from Vulkan-Docs, so drop useless shebang
 	@${FIND} ${WRKSRC}/registry -name \*.py -exec ${REINPLACE_CMD} -i '' '/^#!/d' {} +
 
 post-patch:
 # XXX Drop after FreeBSD 12.* EOL around 2024-06-30
 	@if [ -L /usr/include/sched.h ]; then \
 		${REINPLACE_CMD} $$'/^namespace/i\\\n#undef major\\\n#undef minor\\\n\\\n' \
 			${WRKSRC}/include/vulkan/vulkan_structs.hpp; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo
index c88e1da36b55..7d1b92a797d6 100644
--- a/graphics/vulkan-headers/distinfo
+++ b/graphics/vulkan-headers/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1689978770
-SHA256 (KhronosGroup-Vulkan-Headers-v1.3.258_GH0.tar.gz) = 00a1f1859bd1ee8337f75d3c94c8f2d0065b9681f29d7255abaaadfe0c9bb349
-SIZE (KhronosGroup-Vulkan-Headers-v1.3.258_GH0.tar.gz) = 2000550
+TIMESTAMP = 1690026749
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.259_GH0.tar.gz) = da9e625935014e8aa1c31c4ab45d7b015d73185586b1bdf70c646d66cbddc3d3
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.259_GH0.tar.gz) = 2000576
diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
index dd753d0e7724..735163063420 100644
--- a/graphics/vulkan-loader/Makefile
+++ b/graphics/vulkan-loader/Makefile
@@ -1,52 +1,57 @@
 PORTNAME=	vulkan-loader
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.258
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Driver loader for the Vulkan graphics API
 WWW=		https://github.com/KhronosGroup/Vulkan-Loader
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	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-Loader
 CMAKE_ON=	CMAKE_SKIP_RPATH
 CMAKE_OFF=	BUILD_TESTS
 
+.if ${DISTVERSION:E} < 259
+GH_TUPLE+=	KhronosGroup:Vulkan-Headers:v1.3.258:vkheaders/Vulkan-Headers
+CFLAGS+=	-isystem${WRKSRC_vkheaders}/include -isystem${LOCALBASE}/include
+.endif
+
 OPTIONS_DEFINE=	WAYLAND XCB XLIB
 OPTIONS_DEFAULT=WAYLAND XCB XLIB
 
 WAYLAND_LIB_DEPENDS=	libwayland-client.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-patch:
 # Extract (snapshot) version from the port
 # Respect PREFIX when XDG_CONFIG_DIRS and XDG_DATA_DIRS are unset
 	@${REINPLACE_CMD} -e '/find_.*Git/d' \
 		-e '/BRANCH/s/--unknown--/main/' \
 		-e '/TAG/s/--unknown--/${DISTVERSIONFULL}/' \
 		-e '/FALLBACK/s,/etc,${PREFIX}&,' \
 		-e 's,/usr/local,${PREFIX},' \
 		${WRKSRC}/CMakeLists.txt
 # https://github.com/llvm/llvm-project/issues/46692
 	@if [ "${CHOSEN_COMPILER_TYPE}-${ARCH}-${_OSRELEASE:C/.*-//}" = "clang-i386-CURRENT" ]; then \
 		${ECHO} "disabled" >${WRKSRC}/loader/asm_test_x86.S; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo
index d6e7a18b54be..087582274cc2 100644
--- a/graphics/vulkan-loader/distinfo
+++ b/graphics/vulkan-loader/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1689958987
 SHA256 (KhronosGroup-Vulkan-Loader-v1.3.258_GH0.tar.gz) = 2617f6930dca61af296ab075c33bf144a7e2d6369b595effca845dd14d3b9b91
 SIZE (KhronosGroup-Vulkan-Loader-v1.3.258_GH0.tar.gz) = 1677509
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.258_GH0.tar.gz) = 00a1f1859bd1ee8337f75d3c94c8f2d0065b9681f29d7255abaaadfe0c9bb349
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.258_GH0.tar.gz) = 2000550