diff --git a/graphics/vulkan-caps-viewer/Makefile b/graphics/vulkan-caps-viewer/Makefile
index 5f854517c7ac..5ec73d3263a3 100644
--- a/graphics/vulkan-caps-viewer/Makefile
+++ b/graphics/vulkan-caps-viewer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	vulkan-caps-viewer
-DISTVERSION=	2.21
+DISTVERSION=	3.0
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -16,7 +16,7 @@ USE_GITHUB=	yes
 USE_QT=		qmake_build buildtools_build core gui network widgets
 GH_ACCOUNT=	SaschaWillems
 GH_PROJECT=	VulkanCapsViewer
-GH_TUPLE=	KhronosGroup:Vulkan-Headers:v1.2.154:vkheaders/Vulkan-Headers
+GH_TUPLE=	KhronosGroup:Vulkan-Headers:v1.2.165:vkheaders/Vulkan-Headers
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (GL, wayland)
 PLIST_FILES=	bin/vulkanCapsViewer \
 		share/applications/vulkanCapsViewer.desktop \
@@ -27,8 +27,10 @@ OPTIONS_DEFAULT=WAYLAND X11
 
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_USE=		QT=wayland_build
+WAYLAND_QMAKE_ON=	DEFINES+=WAYLAND
 
 X11_USE=		QT=x11extras
+X11_QMAKE_ON=		DEFINES+=X11
 
 post-patch:
 # Hint qmake how to install generated file
@@ -42,12 +44,4 @@ post-patch:
 		${WRKSRC}/vulkancapsviewer.cpp \
 		${WRKSRC}/Vulkan-Headers/include/vulkan/vulkan.hpp
 
-post-patch-WAYLAND-off:
-	@${REINPLACE_CMD} -i .nowayland '/qtHave/s/wayland/DISABLED&/' \
-		${WRKSRC}/vulkanCapsViewer.pro
-
-post-patch-X11-off:
-	@${REINPLACE_CMD} -i .nox11 '/qtHave/s/x11/DISABLED&/' \
-		${WRKSRC}/vulkanCapsViewer.pro
-
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-caps-viewer/distinfo b/graphics/vulkan-caps-viewer/distinfo
index 44250ae91a6f..a3a45e137eaa 100644
--- a/graphics/vulkan-caps-viewer/distinfo
+++ b/graphics/vulkan-caps-viewer/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1601046886
-SHA256 (SaschaWillems-VulkanCapsViewer-2.21_GH0.tar.gz) = c740b0e252deb34cb39fa3393699922b40bbe944ccb050903500145338927ef5
-SIZE (SaschaWillems-VulkanCapsViewer-2.21_GH0.tar.gz) = 827875
-SHA256 (KhronosGroup-Vulkan-Headers-v1.2.154_GH0.tar.gz) = b636f0ace2c2b8a7dbdfddf16c53c1f49a4b39d6da562727bfea00b5ec447537
-SIZE (KhronosGroup-Vulkan-Headers-v1.2.154_GH0.tar.gz) = 817069
+TIMESTAMP = 1610295994
+SHA256 (SaschaWillems-VulkanCapsViewer-3.0_GH0.tar.gz) = 0cbec45d347028c3d161b42615cfabe3861ea0e0606e3bbe46aa45a0a3efd7ce
+SIZE (SaschaWillems-VulkanCapsViewer-3.0_GH0.tar.gz) = 897869
+SHA256 (KhronosGroup-Vulkan-Headers-v1.2.165_GH0.tar.gz) = 3f9435a93ba13d94d0c3265a47e0436579e46bb9ca085e9b16a753458e4d79d2
+SIZE (KhronosGroup-Vulkan-Headers-v1.2.165_GH0.tar.gz) = 861347