diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 85a08341a978..54cef6945044 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,44 +1,39 @@
 PORTNAME=	libxkbcommon
-PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTVERSION=	1.2.1
 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
+USES=		bison compiler:c11 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=	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 77ae65c0ac56..6e89cc794d61 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,7 +1,3 @@
-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
+TIMESTAMP = 1617812871
+SHA256 (xorg/lib/libxkbcommon-1.2.1.tar.xz) = e833a7d3024c9bb9d5eb2b20f6d5de08865541f21bb7ba227c83cbd236691fb3
+SIZE (xorg/lib/libxkbcommon-1.2.1.tar.xz) = 453172