diff --git a/x11-servers/xlibre-server/Makefile b/x11-servers/xlibre-server/Makefile
index 02e7d96e4799..6c03ac0aa02b 100644
--- a/x11-servers/xlibre-server/Makefile
+++ b/x11-servers/xlibre-server/Makefile
@@ -1,66 +1,69 @@
 PORTNAME=	xlibre-server
 PORTVERSION=	${XLIBRE_VER}
-PORTREVISION=	1
 CATEGORIES=	x11-servers
 
 MAINTAINER=	xlibre@FreeBSD.org
 COMMENT=	Xlibre X server
 WWW=		https://github.com/X11Libre/xserver/
 
 LICENSE=	MIT
 
 CONFLICTS=	xorg-server
 
 USES+=		xlibre-cat:server
 
 OPTIONS_SUB=	YES
 OPTIONS_DEFINE=	UDEV SUID NVIDIA_ABI INPUTTEST SEATD
 OPTIONS_DEFAULT=UDEV SUID INPUTTEST SEATD
 
 UDEV_DESC=		Enable udev. (For libinput & autoconfiguration/hotplug)
 UDEV_MESON_TRUE=	udev udev_kms
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 
 SUID_DESC=		Enable the setuid binary. (For starting X as a normal user)
 SUID_MESON_TRUE=	suid_wrapper
 
 OPTIONS_DEFAULT_amd64=	NVIDIA_ABI
 OPTIONS_DEFAULT_i386=	NVIDIA_ABI
 
 NVIDIA_ABI_DESC=	Rebuild XLibre drivers if switched! Fixes for NVIDIA drivers.
 NVIDIA_ABI_MESON_TRUE=	legacy_nvidia_padding legacy_nvidia_340x
 
 INPUTTEST_DESC=		Build inputtest driver. (For testing and automation)
 INPUTTEST_MESON_TRUE=	xf86-input-inputtest
 
 SEATD_DESC=		Build with seatd support. (For running X unprivileged)
 SEATD_MESON_TRUE=	seatd_libseat
 SEATD_LIB_DEPENDS=	libseat.so:sysutils/seatd
 
 LIB_DEPENDS+=	libxcvt.so:x11/libxcvt \
 		libdrm.so:graphics/libdrm \
 		libepoll-shim.so:devel/libepoll-shim \
 		libepoxy.so:graphics/libepoxy
 
 MESON_ARGS+=	-Dlog_dir=/var/log \
 		-Ddrm=true
 
 PLIST_SUB+=	FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}"
 
 USE_XORG+=	pciaccess
 
 USE_GL+=	gbm
 
 .include 	"${.CURDIR}/../xlibre-server/Makefile.common"
 
 OLDMODULEDIR=	/lib/xorg/modules
+
+post-patch:
+	@${REINPLACE_CMD} -e '43,54d' ${WRKSRC}/config/meson.build
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
 	@${MKDIR} ${STAGEDIR}${PREFIX}${OLDMODULEDIR}/extensions
 	@${MKDIR} ${STAGEDIR}${PREFIX}${OLDMODULEDIR}/drivers
 	@${MKDIR} ${STAGEDIR}${PREFIX}${OLDMODULEDIR}/input
 	@${MKDIR} ${STAGEDIR}${FONTPATHD}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d
 	@${INSTALL_DATA} ${FILESDIR}/20-evdev-kbd.conf \
 		${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xlibre-server/Makefile.version b/x11-servers/xlibre-server/Makefile.version
index e6eff2f0e263..75a7b4db1491 100644
--- a/x11-servers/xlibre-server/Makefile.version
+++ b/x11-servers/xlibre-server/Makefile.version
@@ -1,4 +1,4 @@
 XLIBRE_MJR_VER=25
-XLIBRE_MIN_VER=1.5
+XLIBRE_MIN_VER=1.6
 
 XLIBRE_VER=${XLIBRE_MJR_VER}.${XLIBRE_MIN_VER}
diff --git a/x11-servers/xlibre-server/distinfo b/x11-servers/xlibre-server/distinfo
index 1abfa792ab56..89653992a37a 100644
--- a/x11-servers/xlibre-server/distinfo
+++ b/x11-servers/xlibre-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1777494799
-SHA256 (xlibre/server/X11Libre-xserver-25.1.5-xlibre-xserver-25.1.5_GH0.tar.gz) = 7ee3612e7674595d7cef337d6955fddf02e63719cbc2607b29d80a17891eca0e
-SIZE (xlibre/server/X11Libre-xserver-25.1.5-xlibre-xserver-25.1.5_GH0.tar.gz) = 5491211
+TIMESTAMP = 1780682382
+SHA256 (xlibre/server/X11Libre-xserver-25.1.6-xlibre-xserver-25.1.6_GH0.tar.gz) = f03fe4a7b1a060ca5100b6e71537bcfe88a998ef9f7a3a8c094e3005d7203276
+SIZE (xlibre/server/X11Libre-xserver-25.1.6-xlibre-xserver-25.1.6_GH0.tar.gz) = 5496335
diff --git a/x11-servers/xlibre-server/pkg-plist b/x11-servers/xlibre-server/pkg-plist
index 4899a6aee310..e8e7e18a49b7 100644
--- a/x11-servers/xlibre-server/pkg-plist
+++ b/x11-servers/xlibre-server/pkg-plist
@@ -1,174 +1,175 @@
 bin/X
 bin/Xorg
 bin/gtf
 include/xorg/Xprintf.h
 include/xorg/callback.h
 include/xorg/closure.h
 include/xorg/colormap.h
 include/xorg/colormapst.h
 include/xorg/compiler.h
 include/xorg/compositeext.h
 include/xorg/cursor.h
 include/xorg/cursorstr.h
 include/xorg/damage.h
 include/xorg/damagestr.h
 include/xorg/dgaproc.h
 include/xorg/displaymode.h
 include/xorg/dix.h
 include/xorg/dixaccess.h
 include/xorg/dixfont.h
 include/xorg/dixfontstr.h
 include/xorg/dixstruct.h
 include/xorg/dri.h
 include/xorg/dri2.h
 include/xorg/dri3.h
 include/xorg/dristruct.h
 include/xorg/edid.h
 include/xorg/events.h
 include/xorg/exa.h
 include/xorg/exevents.h
 include/xorg/extension.h
 include/xorg/extinit.h
 include/xorg/extnsionst.h
 include/xorg/fb.h
 include/xorg/fbdevhw.h
 include/xorg/fboverlay.h
 include/xorg/fbpict.h
 include/xorg/fbrop.h
 include/xorg/fd_notify.h
 include/xorg/fourcc.h
 include/xorg/gc.h
 include/xorg/gcstruct.h
 include/xorg/glamor.h
 include/xorg/globals.h
 include/xorg/glxvndabi.h
 include/xorg/glyphstr.h
 include/xorg/i2c_def.h
 include/xorg/input.h
 include/xorg/inputstr.h
 include/xorg/list.h
 include/xorg/mi.h
 include/xorg/micmap.h
 include/xorg/micoord.h
 include/xorg/migc.h
 include/xorg/miline.h
 include/xorg/mioverlay.h
 include/xorg/mipict.h
 include/xorg/mipointer.h
 include/xorg/mipointrst.h
 include/xorg/misc.h
 include/xorg/miscstruct.h
 include/xorg/mistruct.h
 include/xorg/misync.h
 include/xorg/misyncfd.h
 include/xorg/misyncshm.h
 include/xorg/misyncstr.h
 include/xorg/mizerarc.h
 include/xorg/opaque.h
 include/xorg/optionstr.h
 include/xorg/os.h
 include/xorg/picture.h
 include/xorg/picturestr.h
 include/xorg/pixmap.h
 include/xorg/pixmapstr.h
 include/xorg/present.h
 include/xorg/privates.h
 include/xorg/property.h
 include/xorg/ptrveloc.h
 include/xorg/randrstr.h
 include/xorg/region.h
 include/xorg/regionstr.h
 include/xorg/resource.h
 include/xorg/rgb.h
 include/xorg/rrtransform.h
 include/xorg/sarea.h
 include/xorg/screenint.h
 include/xorg/scrnintstr.h
 include/xorg/servermd.h
 include/xorg/shadow.h
 include/xorg/shadowfb.h
 include/xorg/shmint.h
 include/xorg/syncsdk.h
 include/xorg/validate.h
 include/xorg/vbe.h
 include/xorg/vbeModes.h
 include/xorg/vgaHW.h
 include/xorg/vndserver.h
 include/xorg/wfbrename.h
 include/xorg/window.h
 include/xorg/windowstr.h
 include/xorg/xaarop.h
 %%INPUTTEST%%include/xorg/xf86-input-inputtest-protocol.h
 include/xorg/xf86.h
 include/xorg/xf86Crtc.h
 include/xorg/xf86Cursor.h
 include/xorg/xf86DDC.h
 include/xorg/xf86Modes.h
 include/xorg/xf86Module.h
 include/xorg/xf86Opt.h
 include/xorg/xf86Optionstr.h
 include/xorg/xf86Optrec.h
 include/xorg/xf86Parser.h
 include/xorg/xf86Pci.h
 include/xorg/xf86PciInfo.h
 include/xorg/xf86Priv.h
 include/xorg/xf86Privstr.h
 include/xorg/xf86RandR12.h
 include/xorg/xf86Xinput.h
 include/xorg/xf86_OSlib.h
 include/xorg/xf86_OSproc.h
 include/xorg/xf86cmap.h
 include/xorg/xf86fbman.h
 include/xorg/xf86i2c.h
 include/xorg/xf86int10.h
 include/xorg/xf86platformBus.h
 include/xorg/xf86sbusBus.h
 include/xorg/xf86str.h
 include/xorg/xf86xv.h
 include/xorg/xf86xvmc.h
 include/xorg/xisb.h
 include/xorg/xkbrules.h
 include/xorg/xkbsrv.h
 include/xorg/xkbstr.h
-include/xorg/xorg-server.h
 include/xorg/xlibre-server.h
+include/xorg/xorg-server.h
 include/xorg/xorgVersion.h
 include/xorg/xserver-properties.h
 include/xorg/xvdix.h
 include/xorg/xvmcext.h
 lib/xorg/modules/xlibre-25/drivers/modesetting_drv.so
 lib/xorg/modules/xlibre-25/extensions/libglx.so
 %%INPUTTEST%%lib/xorg/modules/xlibre-25/input/inputtest_drv.so
 lib/xorg/modules/xlibre-25/libexa.so
 lib/xorg/modules/xlibre-25/libfbdevhw.so
 lib/xorg/modules/xlibre-25/libglamoregl.so
 lib/xorg/modules/xlibre-25/libint10.so
 lib/xorg/modules/xlibre-25/libshadow.so
 lib/xorg/modules/xlibre-25/libshadowfb.so
 lib/xorg/modules/xlibre-25/libvgahw.so
 lib/xorg/modules/xlibre-25/libwfb.so
 lib/xorg/protocol.txt
-libdata/pkgconfig/xorg-server.pc
 libdata/pkgconfig/xlibre-server.pc
+libdata/pkgconfig/xorg-server.pc
 %%SUID%%libexec/Xorg
 %%SUID%%@(,,4555) libexec/Xorg.wrap
+share/X11/xorg.conf.d/10-nvidia-modules.conf
+share/X11/xorg.conf.d/10-nvidia.conf
 %%UDEV%%share/X11/xorg.conf.d/10-quirks.conf
 share/X11/xorg.conf.d/20-evdev-kbd.conf
-share/X11/xorg.conf.d/10-nvidia.conf
 share/aclocal/xorg-server.m4
 share/man/man1/Xorg.1.gz
 %%SUID%%share/man/man1/Xorg.wrap.1.gz
 share/man/man1/Xserver.1.gz
 share/man/man1/gtf.1.gz
 share/man/man4/exa.4.gz
 share/man/man4/fbdevhw.4.gz
 %%INPUTTEST%%share/man/man4/inputtestdrv.4.gz
 share/man/man4/modesetting.4.gz
 %%SUID%%share/man/man5/Xwrapper.config.5.gz
 share/man/man5/xorg.conf.5.gz
 share/man/man5/xorg.conf.d.5.gz
 @dir %%FONTPATHD%%
 @dir etc/X11/xorg.conf.d
 @dir lib/xorg/modules/drivers
-@dir lib/xorg/modules/input
 @dir lib/xorg/modules/extensions
+@dir lib/xorg/modules/input