diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index ebacd5c2495d..85a08341a978 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,36 +1,44 @@
 PORTNAME=	libxkbcommon
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
 DIST_SUBDIR=	xorg/lib
 
+PATCH_SITES=	https://github.com/xkbcommon/libxkbcommon/commit/
+PATCHFILES+=	6b65be4c4e78.patch:-p1 # https://github.com/xkbcommon/libxkbcommon/pull/221
+PATCHFILES+=	c14910a0de22.patch:-p1 # 6b65be4c4e78 fixup
+
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Keymap handling library for toolkits and window systems
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	xkeyboard-config>0:x11/xkeyboard-config
 
 USES=		bison gnome meson pkgconfig tar:xz
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Denable-docs=false \
 		-Dx-locale-root="${PREFIX}/lib/X11/locale" \
 		${MESON_ARGS_${OPSYS}_${OSREL:R}}
 MESON_ARGS_FreeBSD_11=	-Ddefault-rules=xorg
 
-OPTIONS_DEFINE=	WAYLAND X11
-OPTIONS_DEFAULT=WAYLAND X11
+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.mk>
diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo
index 1aa6fda4cf26..77ae65c0ac56 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1614458944
 SHA256 (xorg/lib/libxkbcommon-1.1.0.tar.xz) = 412cfcca596f92914ea1a66ad244804d73a5ff20b6d86459951e7ad20576c246
 SIZE (xorg/lib/libxkbcommon-1.1.0.tar.xz) = 439488
+SHA256 (xorg/lib/6b65be4c4e78.patch) = 0b7c110c5bab19a4392ece1acfd05b7afee724ca970854847b0369f0a6481c64
+SIZE (xorg/lib/6b65be4c4e78.patch) = 4318
+SHA256 (xorg/lib/c14910a0de22.patch) = 0937ce7cdb97dbc3726bf6b9a7da03375926c303d1ea5f5fbd1eb7622b156f8d
+SIZE (xorg/lib/c14910a0de22.patch) = 861
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index 131517a33ab8..e004f90d0247 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -1,31 +1,33 @@
 bin/xkbcli
 include/xkbcommon/xkbcommon.h
 include/xkbcommon/xkbcommon-compat.h
 include/xkbcommon/xkbcommon-compose.h
 include/xkbcommon/xkbcommon-keysyms.h
 include/xkbcommon/xkbcommon-names.h
 include/xkbcommon/xkbregistry.h
 %%X11%%include/xkbcommon/xkbcommon-x11.h
 lib/libxkbcommon.so
 lib/libxkbcommon.so.0
 lib/libxkbcommon.so.0.0.0
 %%X11%%lib/libxkbcommon-x11.so
 %%X11%%lib/libxkbcommon-x11.so.0
 %%X11%%lib/libxkbcommon-x11.so.0.0.0
 lib/libxkbregistry.so
 lib/libxkbregistry.so.0
 lib/libxkbregistry.so.0.0.0
 libdata/pkgconfig/xkbcommon.pc
 %%X11%%libdata/pkgconfig/xkbcommon-x11.pc
 libdata/pkgconfig/xkbregistry.pc
 libexec/xkbcommon/xkbcli-compile-keymap
 libexec/xkbcommon/xkbcli-how-to-type
+%%EVDEV%%libexec/xkbcommon/xkbcli-interactive-evdev
 %%WAYLAND%%libexec/xkbcommon/xkbcli-interactive-wayland
 %%X11%%libexec/xkbcommon/xkbcli-interactive-x11
 libexec/xkbcommon/xkbcli-list
 man/man1/xkbcli-compile-keymap.1.gz
 man/man1/xkbcli-how-to-type.1.gz
+%%EVDEV%%man/man1/xkbcli-interactive-evdev.1.gz
 %%WAYLAND%%man/man1/xkbcli-interactive-wayland.1.gz
 %%X11%%man/man1/xkbcli-interactive-x11.1.gz
 man/man1/xkbcli-list.1.gz
 man/man1/xkbcli.1.gz