diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index a693a1f18f15..5576c2c64ee7 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	libxkbcommon
-PORTVERSION=	1.7.0
-PORTREVISION=	1
+PORTVERSION=	1.8.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 python:test \
-		shebangfix tar:xz
+		shebangfix
 USE_GNOME=	libxml2
+USE_GITHUB=	yes
+GH_ACCOUNT=	xkbcommon
+GH_TAGNAME=	${GH_ACCOUNT}-${PORTVERSION}
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Denable-docs=false \
 		-Dx-locale-root="${PREFIX}/lib/X11/locale" \
 		${MESON_ARGS_${OPSYS}_${OSREL:R}}
 CPE_VENDOR=	xkbcommon
 SHEBANG_FILES=	test/xkeyboard-config-test.py.in \
 		test/*.py
 
 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 bbcf2f77ad66..565ac7e4605f 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714057479
-SHA256 (libxkbcommon-1.7.0.tar.xz) = 65782f0a10a4b455af9c6baab7040e2f537520caa2ec2092805cdfd36863b247
-SIZE (libxkbcommon-1.7.0.tar.xz) = 534312
+TIMESTAMP = 1741854727
+SHA256 (xkbcommon-libxkbcommon-1.8.0-xkbcommon-1.8.0_GH0.tar.gz) = 025c53032776ed850fbfb92683a703048cd70256df4ac1a1ec41ed3455d5d39c
+SIZE (xkbcommon-libxkbcommon-1.8.0-xkbcommon-1.8.0_GH0.tar.gz) = 995648
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index 6c7a5aa659ea..3a090ca9c1a9 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -1,36 +1,40 @@
 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
+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.0.0
+%%X11%%lib/libxkbcommon-x11.so.0.8.0
+lib/libxkbcommon.so
+lib/libxkbcommon.so.0
+lib/libxkbcommon.so.0.8.0
 lib/libxkbregistry.so
 lib/libxkbregistry.so.0
-lib/libxkbregistry.so.0.0.0
-libdata/pkgconfig/xkbcommon.pc
+lib/libxkbregistry.so.0.8.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
+%%WAYLAND%%libexec/xkbcommon/xkbcli-dump-keymap-wayland
+%%X11%%libexec/xkbcommon/xkbcli-dump-keymap-x11
 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
+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
-share/bash-completion/completions/xkbcli