diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile
index 4eb2841c410f..cd7b8859eba9 100644
--- a/net/xrdp-devel/Makefile
+++ b/net/xrdp-devel/Makefile
@@ -1,97 +1,95 @@
 # Created by: alepulver
 
 PORTNAME=	xrdp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.80.b20220510
-PORTREVISION=	1
+DISTVERSION=	0.9.80.b20220528
 PORTEPOCH=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR?=	${PORTNAME}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	Open source Remote Desktop Protocol (RDP) server (development version)
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:devel/nasm
 RUN_DEPENDS=	xterm:x11/xterm \
 		${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp-devel \
 		${LOCALBASE}/lib/pulse-14.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		autoreconf:build compiler:c11 cpe jpeg localbase libtool pkgconfig \
 		ssl xorg
 CPE_VENDOR=	neutrinolabs
 USE_XORG=	ice pixman sm x11 xfixes xrandr
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 GH_ACCOUNT=	neutrinolabs
-GH_TAGNAME=	df425c2
+GH_TAGNAME=	55215cf
 GH_TUPLE=	neutrinolabs:librfxcodec:79619b6:librfxcodec/librfxcodec \
-		neutrinolabs:libpainter:v0.1.1:libpainter/libpainter
+		neutrinolabs:libpainter:v0.1.1:libpainter/libpainter \
+		neutrinolabs:ulalaca-xrdp:f683d17:ulalaca/ulalaca
 
 CONFIGURE_ARGS=	--localstatedir=/var --enable-strict-locations \
 		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
-		--with-socketdir=/var/run/xrdp \
-		--with-sesmanruntimedir=/var/run/xrdp-sesman \
 		--enable-pam-config=freebsd \
 		--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter \
 		--enable-imlib2
 LDFLAGS+=	-lssl
 CONFLICTS=	xrdp
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	OPENSSLBASE=${OPENSSLBASE}
 
 OPTIONS_DEFINE=	DEBUG FUSE IPV6
 OPTIONS_DEFAULT=	FDKAAC OPUS
 OPTIONS_GROUP=	AUDIO_CODEC
 OPTIONS_GROUP_AUDIO_CODEC=	FDKAAC MP3LAME OPUS
 FDKAAC_DESC=	Enable Fraunhofer FDK AAC for audio redirection
 FUSE_DESC=	Enable drive redirection via FUSE (experimental)
 MP3LAME_DESC=	Enable MP3 Lame for audio redirection
 OPUS_DESC=	Enable Opus for audio redirection
 
 DEBUG_CONFIGURE_ENABLE=	devel-debug devel-logging
 FDKAAC_CONFIGURE_ENABLE=	fdkaac
 FDKAAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
 FUSE_CONFIGURE_ENABLE=	fuse
 FUSE_USES=		fuse
 IPV6_CONFIGURE_ENABLE=	ipv6
 MP3LAME_CONFIGURE_ENABLE=	mp3lame
 MP3LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 OPUS_CONFIGURE_ENABLE=	opus
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 # As base OpenSSL doesn't install a .pc file, some flags such as -lcrypto
 # cannot be obtained automatically via pkgconfig. When compiled with base
 # OpenSSL, it needs to be specified explicitly.
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 .endif
 
 pre-configure:
-	@${REINPLACE_CMD} -e "s|0.9.14|${DISTVERSION}-${GH_TAGNAME}|" ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e "s|0.9.80|${DISTVERSION}-${GH_TAGNAME}|" ${WRKSRC}/configure.ac
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/startwm.sh ${STAGEDIR}${ETCDIR}
 
 post-stage:
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/cert.pem
 	@${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/key.pem
 .for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini
 	@${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/net/xrdp-devel/distinfo b/net/xrdp-devel/distinfo
index e64cfd4501fc..fc6c6984073a 100644
--- a/net/xrdp-devel/distinfo
+++ b/net/xrdp-devel/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1652171600
-SHA256 (xrdp/neutrinolabs-xrdp-v0.9.80.b20220510-df425c2_GH0.tar.gz) = 277d90d293d561d3f134f0cf22434fdad68e1d7eb63d3ef66ad87e6eccbad23a
-SIZE (xrdp/neutrinolabs-xrdp-v0.9.80.b20220510-df425c2_GH0.tar.gz) = 809643
+TIMESTAMP = 1654059804
+SHA256 (xrdp/neutrinolabs-xrdp-v0.9.80.b20220528-55215cf_GH0.tar.gz) = 0f654640786a86741133edd106490596ed4c476417b8f94d63240a2bd7ee1f50
+SIZE (xrdp/neutrinolabs-xrdp-v0.9.80.b20220528-55215cf_GH0.tar.gz) = 813214
 SHA256 (xrdp/neutrinolabs-librfxcodec-79619b6_GH0.tar.gz) = e2ab0f2181c628ab591bb39921ee03ab48644ea1f5e1e9996649a8523667b240
 SIZE (xrdp/neutrinolabs-librfxcodec-79619b6_GH0.tar.gz) = 54816
 SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
 SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929
+SHA256 (xrdp/neutrinolabs-ulalaca-xrdp-f683d17_GH0.tar.gz) = 7745c30c26986bfa537237053de34e9feaae8f2f4af1a9a898be680771b891b8
+SIZE (xrdp/neutrinolabs-ulalaca-xrdp-f683d17_GH0.tar.gz) = 18247