diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
index cb6575a3dba8..d1947d970637 100644
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -1,61 +1,64 @@
 PORTNAME=	vulkan-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.182
 CATEGORIES=	graphics
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	8926213dd008.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Tools/pull/544
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Tools and demos for the Vulkan graphics API
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 		vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 
 USES=		cmake compiler:c++11-lib pkgconfig python:3.4+,build
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-Tools
 CMAKE_OFF=	BUILD_CUBE BUILD_ICD
 CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}"
 
 OPTIONS_DEFINE=		WAYLAND XCB XLIB
 OPTIONS_DEFAULT=	WAYLAND XCB XLIB
 OPTIONS_SLAVE=		DISPLAY
 OPTIONS_SUB=		yes
 
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
 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,xext,ice,sm
 XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
 
 # https://github.com/KhronosGroup/Vulkan-Tools/issues/307
 .for _wsi in display wayland xcb xlib
 do-configure-${_wsi:tu}-on: ${_wsi}-configure
 ${_wsi}-configure:
 	@${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} \
 		-DBUILD_CUBE:BOOL=ON -DBUILD_VULKANINFO:BOOL=OFF \
 		-DCUBE_WSI_SELECTION:STRING=${_wsi:tu} \
 		-B${CONFIGURE_WRKSRC}-${_wsi}
 do-build-${_wsi:tu}-on: ${_wsi}-build
 ${_wsi}-build:
 	@${SETENV} ${MAKE_ENV} ${CMAKE_BIN} --build ${BUILD_WRKSRC}-${_wsi}
 do-install-${_wsi:tu}-on: ${_wsi}-install
 ${_wsi}-install:
 . for _file in vkcube vkcubepp
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}-${_wsi}/cube/${_file} \
 		${STAGEDIR}${PREFIX}/bin/${_file}-${_wsi}
 . endfor
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo
index 85bca30da68d..e2a358148133 100644
--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1624299185
 SHA256 (KhronosGroup-Vulkan-Tools-v1.2.182_GH0.tar.gz) = 50c959851230d1daba20235167faced7b7686ebe5d9e626dfb1fe5c92fa30b9e
 SIZE (KhronosGroup-Vulkan-Tools-v1.2.182_GH0.tar.gz) = 847991
+SHA256 (8926213dd008.patch) = 4e22c90a53c4f7f7623da18ba6f097a49e9a6100fb5c4fb738a98e62d445bfaf
+SIZE (8926213dd008.patch) = 1140
diff --git a/graphics/vulkan-tools/files/patch-werror b/graphics/vulkan-tools/files/patch-werror
deleted file mode 100644
index e6a979defc7c..000000000000
--- a/graphics/vulkan-tools/files/patch-werror
+++ /dev/null
@@ -1,20 +0,0 @@
-Silence Clang warnings that GCC ignores
-https://github.com/KhronosGroup/Vulkan-Tools/issues/532
-
---- cube/cube.cpp.orig	2021-06-21 18:13:05 UTC
-+++ cube/cube.cpp
-@@ -405,14 +405,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM 
- #endif
- 
- #if defined(VK_USE_PLATFORM_WAYLAND_KHR)
--static void handle_ping(void *data, wl_shell_surface *shell_surface, uint32_t serial) {
--    wl_shell_surface_pong(shell_surface, serial);
--}
--
--static void handle_configure(void *data, wl_shell_surface *shell_surface, uint32_t edges, int32_t width, int32_t height) {}
--
--static void handle_popup_done(void *data, wl_shell_surface *shell_surface) {}
--
- static void pointer_handle_enter(void *data, struct wl_pointer *pointer, uint32_t serial, struct wl_surface *surface, wl_fixed_t sx,
-                                  wl_fixed_t sy) {}
-