diff --git a/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp b/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp
new file mode 100644
index 000000000000..c437e8d69127
--- /dev/null
+++ b/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp
@@ -0,0 +1,13 @@
+--- src/gui/platform/unix/qxkbcommon.cpp.orig	2023-09-21 19:24:26 UTC
++++ src/gui/platform/unix/qxkbcommon.cpp
+@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray(
+         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
+-        Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
+-        Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
+-        Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
+-        Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+ 
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp b/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp
new file mode 100644
index 000000000000..7b6fa29aaaa0
--- /dev/null
+++ b/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp
@@ -0,0 +1,13 @@
+--- src/platformsupport/input/xkbcommon/qxkbcommon.cpp.orig	2023-09-06 08:28:54 UTC
++++ src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+@@ -274,10 +274,6 @@ static constexpr const auto KeyTbl = qMakeArray(
+         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
+-        Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
+-        Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
+-        Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
+-        Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+ 
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 48f9f9dcd443..d3ce4abd1f06 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	libxkbcommon
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 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/distinfo b/x11/libxkbcommon/distinfo
index 38ea44e8393c..6bb837d1f481 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672687410
-SHA256 (libxkbcommon-1.5.0.tar.xz) = 560f11c4bbbca10f495f3ef7d3a6aa4ca62b4f8fb0b52e7d459d18a26e46e017
-SIZE (libxkbcommon-1.5.0.tar.xz) = 472700
+TIMESTAMP = 1696798008
+SHA256 (libxkbcommon-1.6.0.tar.xz) = 0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b
+SIZE (libxkbcommon-1.6.0.tar.xz) = 510456
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index e004f90d0247..49e58fa81021 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -1,33 +1,34 @@
 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
+share/bash-completion/completions/xkbcli