diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index d3ce4abd1f06..82dd54941dec 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	libxkbcommon
 PORTVERSION=	1.6.0
+PORTVERSION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
 
 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 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}}
 CPE_VENDOR=	xkbcommon
 
 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/files/patch-meson.build b/x11/libxkbcommon/files/patch-meson.build
new file mode 100644
index 000000000000..67323a645fb6
--- /dev/null
+++ b/x11/libxkbcommon/files/patch-meson.build
@@ -0,0 +1,11 @@
+--- meson.build.orig	2023-10-08 20:46:48 UTC
++++ meson.build
+@@ -145,7 +145,7 @@ have_version_script = cc.links(
+ # Supports -Wl,--version-script?
+ have_version_script = cc.links(
+     'int main(){}',
+-    args: '-Wl,--version-script=' + meson.current_source_dir()/'xkbcommon.map',
++    args: '-Wl,--undefined-version,--version-script=' + meson.current_source_dir()/'xkbcommon.map',
+     name: '-Wl,--version-script',
+ )
+