diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index a70bcbd43cd2..aef2b12b0e69 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,47 +1,58 @@
 PORTNAME=	libxkbcommon
 DISTVERSIONPREFIX=	xkbcommon-
 DISTVERSION=	1.13.0
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Keymap handling library for toolkits and window systems
 WWW=		https://xkbcommon.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	xkeyboard-config>0:x11/xkeyboard-config
 
 USES=		bison compiler:c11 cpe gnome meson pkgconfig python:test \
 		shebangfix
 CPE_VENDOR=	xkbcommon
 SHEBANG_FILES=	test/xkeyboard-config-test.py.in \
 		test/*.py
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xkbcommon
 
 HAS_SYMBOL_VERSION=	${PREFIX}/lib/libxkbregistry.so.0.13.0
 
 MESON_ARGS=	-Denable-docs=false \
 		-Dx-locale-root="${PREFIX}/lib/X11/locale"
 
 OPTIONS_DEFINE=	EVDEV WAYLAND X11
 OPTIONS_DEFAULT=EVDEV WAYLAND X11
 OPTIONS_SUB=	yes
 
 EVDEV_DESC=		Interactive debugger for XKB keymaps for evdev
 EVDEV_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 EVDEV_USES=		localbase
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.12:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_MESON_TRUE=	enable-wayland
 
 X11_USES=	xorg
 X11_USE=	XORG=xcb
 X11_MESON_TRUE=	enable-x11
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MEVDEV} || ${PORT_OPTIONS:MWAYLAND} || ${PORT_OPTIONS:MX11}
+PLIST_FILES+=	libexec/xkbcommon/xkbcli-interactive
+.endif
+
+.if ${PORT_OPTIONS:MWAYLAND} || ${PORT_OPTIONS:MX11}
+PLIST_FILES+=	libexec/xkbcommon/xkbcli-dump-keymap
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index 75539c13c78f..8c8cd1cf33f2 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -1,42 +1,40 @@
 bin/xkbcli
 include/xkbcommon/xkbcommon-compat.h
 include/xkbcommon/xkbcommon-compose.h
 include/xkbcommon/xkbcommon-keysyms.h
 include/xkbcommon/xkbcommon-names.h
 %%X11%%include/xkbcommon/xkbcommon-x11.h
 include/xkbcommon/xkbcommon.h
 include/xkbcommon/xkbregistry.h
 %%X11%%lib/libxkbcommon-x11.so
 %%X11%%lib/libxkbcommon-x11.so.0
 %%X11%%lib/libxkbcommon-x11.so.0.13.0
 lib/libxkbcommon.so
 lib/libxkbcommon.so.0
 lib/libxkbcommon.so.0.13.0
 lib/libxkbregistry.so
 lib/libxkbregistry.so.0
 lib/libxkbregistry.so.0.13.0
 %%X11%%libdata/pkgconfig/xkbcommon-x11.pc
 libdata/pkgconfig/xkbcommon.pc
 libdata/pkgconfig/xkbregistry.pc
 libexec/xkbcommon/xkbcli-compile-compose
 libexec/xkbcommon/xkbcli-compile-keymap
-libexec/xkbcommon/xkbcli-dump-keymap
 %%WAYLAND%%libexec/xkbcommon/xkbcli-dump-keymap-wayland
 %%X11%%libexec/xkbcommon/xkbcli-dump-keymap-x11
 libexec/xkbcommon/xkbcli-how-to-type
-libexec/xkbcommon/xkbcli-interactive
 %%EVDEV%%libexec/xkbcommon/xkbcli-interactive-evdev
 %%WAYLAND%%libexec/xkbcommon/xkbcli-interactive-wayland
 %%X11%%libexec/xkbcommon/xkbcli-interactive-x11
 libexec/xkbcommon/xkbcli-list
 share/bash-completion/completions/xkbcli
 share/man/man1/xkbcli-compile-compose.1.gz
 share/man/man1/xkbcli-compile-keymap.1.gz
 %%WAYLAND%%share/man/man1/xkbcli-dump-keymap-wayland.1.gz
 %%X11%%share/man/man1/xkbcli-dump-keymap-x11.1.gz
 share/man/man1/xkbcli-how-to-type.1.gz
 %%EVDEV%%share/man/man1/xkbcli-interactive-evdev.1.gz
 %%WAYLAND%%share/man/man1/xkbcli-interactive-wayland.1.gz
 %%X11%%share/man/man1/xkbcli-interactive-x11.1.gz
 share/man/man1/xkbcli-list.1.gz
 share/man/man1/xkbcli.1.gz