diff --git a/x11-drivers/xorgxrdp-devel/Makefile b/x11-drivers/xorgxrdp-devel/Makefile
index 70d8f1e9f5ac..d49863fe6f1c 100644
--- a/x11-drivers/xorgxrdp-devel/Makefile
+++ b/x11-drivers/xorgxrdp-devel/Makefile
@@ -1,54 +1,73 @@
 PORTNAME=	xorgxrdp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.80.b20260203
 # Be sure to bump PORTREVISION after xorg-server update to force rebuild
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	xrdp
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/
+PATCHFILES=	406.patch:-p1
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	X.Org driver enabling use through an RDP session with xrdp
 WWW=		https://www.xrdp.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	nasm:devel/nasm
 RUN_DEPENDS=	xauth:x11/xauth
 
-USES=		autoreconf libtool:build localbase pkgconfig xorg
+FLAVORS=	xorg xlibre
+FLAVOR?=	${FLAVORS:[1]}
+
+USES=		autoreconf libtool:build localbase pkgconfig
 USE_LDCONFIG=	yes
-USE_XORG=	xorgproto xorg-server
+USE_XORG=	xorgproto
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	neutrinolabs
 GH_TAGNAME=	7abffbf
 GH_TUPLE=	neutrinolabs:xrdp:4d9dde8:xrdp
+
+.if ${FLAVOR} == xlibre
+PKGNAMEPREFIX=	xlibre-
+USES+=		xlibre
+USE_XLIBRE+=	xlibre-server
+_XLIBRE_MAJOR_VER=	25
+_XMODDIR=	lib/xorg/modules/xlibre-${_XLIBRE_MAJOR_VER}
+.else
+USE_XORG=	xorg-server
+USES+=		xorg
+_XMODDIR=	lib/xorg/modules
+.endif
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	XRDP_CFLAGS=-I${WRKSRC_xrdp}/common
 INSTALL_TARGET=	install-strip
 
+PLIST_SUB+=	XMODDIR=${_XMODDIR}
+
 CONFLICTS=	xorgxrdp
 
 OPTIONS_DEFINE=	DEBUG DRI3
 OPTIONS_DEFAULT=	DRI3
 
 DRI3_DESC=	DRI3/Glamor OpenGL Support
 DRI3_LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
 DRI3_CONFIGURE_ENABLE=	glamor
 DRI3_CFLAGS=		-I${LOCALBASE}/include/libdrm
 DRI3_SUB_FILES=		pkg-message
 
 # Bug 285815
 NO_SHLIB_REQUIRES_GLOB=	libglamoregl.so
 
 post-patch-DEBUG-on:
 	${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|#define LOG_LEVEL [0-9]*|#define LOG_LEVEL 20|'
 
 pre-configure:
 	@cd ${WRKSRC} && ./bootstrap
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xorgxrdp-devel/distinfo b/x11-drivers/xorgxrdp-devel/distinfo
index c5dcf2986bc9..30ee81cb9ad9 100644
--- a/x11-drivers/xorgxrdp-devel/distinfo
+++ b/x11-drivers/xorgxrdp-devel/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1770193845
+TIMESTAMP = 1777275232
 SHA256 (xrdp/neutrinolabs-xorgxrdp-v0.10.80.b20260203-7abffbf_GH0.tar.gz) = a8c169cb2339c6ef2d51434b577ea827710405278b244c5c820a7e8977e6afb4
 SIZE (xrdp/neutrinolabs-xorgxrdp-v0.10.80.b20260203-7abffbf_GH0.tar.gz) = 134673
 SHA256 (xrdp/neutrinolabs-xrdp-4d9dde8_GH0.tar.gz) = f5655834cfe46fe2511116e560c5c4cf4ea464103415ba26f16cf9ab9563d5fe
 SIZE (xrdp/neutrinolabs-xrdp-4d9dde8_GH0.tar.gz) = 1282002
+SHA256 (xrdp/406.patch) = be6a29b16265585ffb465fb8dc2b4275fde0f941b20e7437e9c409b654750858
+SIZE (xrdp/406.patch) = 4941
diff --git a/x11-drivers/xorgxrdp-devel/pkg-plist b/x11-drivers/xorgxrdp-devel/pkg-plist
index 298519ee70b2..049ea3d956e2 100644
--- a/x11-drivers/xorgxrdp-devel/pkg-plist
+++ b/x11-drivers/xorgxrdp-devel/pkg-plist
@@ -1,11 +1,11 @@
 @dir /etc/X11/xrdp
 /etc/X11/xrdp/xorg.conf
 /etc/X11/xrdp/xorg_nvidia.conf
-lib/xorg/modules/drivers/xrdpdev_drv.a
-lib/xorg/modules/drivers/xrdpdev_drv.so
-lib/xorg/modules/input/xrdpkeyb_drv.a
-lib/xorg/modules/input/xrdpkeyb_drv.so
-lib/xorg/modules/input/xrdpmouse_drv.a
-lib/xorg/modules/input/xrdpmouse_drv.so
-lib/xorg/modules/libxorgxrdp.a
-lib/xorg/modules/libxorgxrdp.so
+%%XMODDIR%%/drivers/xrdpdev_drv.a
+%%XMODDIR%%/drivers/xrdpdev_drv.so
+%%XMODDIR%%/input/xrdpkeyb_drv.a
+%%XMODDIR%%/input/xrdpkeyb_drv.so
+%%XMODDIR%%/input/xrdpmouse_drv.a
+%%XMODDIR%%/input/xrdpmouse_drv.so
+%%XMODDIR%%/libxorgxrdp.a
+%%XMODDIR%%/libxorgxrdp.so