diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile
index c746343a22cb..ee93eed945ce 100644
--- a/net/xrdp-devel/Makefile
+++ b/net/xrdp-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xrdp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.14
+DISTVERSION=	0.9.15.p20201218
 PORTEPOCH=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-devel
@@ -29,9 +29,10 @@ USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
-GH_ACCOUNT=	neutrinolabs
+#GH_ACCOUNT=	neutrinolabs
+GH_ACCOUNT=	metalefty
 GH_PROJECT=	xrdp librfxcodec:librfxcodec libpainter:libpainter
-GH_TAGNAME=	v0.1.5:librfxcodec v0.1.1:libpainter
+GH_TAGNAME=	70d231b v0.1.5:librfxcodec v0.1.1:libpainter
 
 CONFIGURE_ARGS=	--localstatedir=/var --enable-strict-locations \
 		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
@@ -79,6 +80,7 @@ post-extract:
 	@${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/
 
 pre-configure:
+	@${REINPLACE_CMD} -e "s|0.9.14|${DISTVERSION}-${GH_TAGNAME}|" ${WRKSRC}/configure.ac
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap
 
 post-install:
diff --git a/net/xrdp-devel/distinfo b/net/xrdp-devel/distinfo
index 89d3f6ba2db8..3b2474242f6b 100644
--- a/net/xrdp-devel/distinfo
+++ b/net/xrdp-devel/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1598856500
-SHA256 (xrdp/neutrinolabs-xrdp-v0.9.14_GH0.tar.gz) = f46d90f3272531b9dec032fcf16104ea73d33b17f9720cd3d541203182df2c88
-SIZE (xrdp/neutrinolabs-xrdp-v0.9.14_GH0.tar.gz) = 695062
-SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.5_GH0.tar.gz) = 5710a65a9f877aca5b5bca9f2fb83b5904b59d465ab5c10bcf4ffc2b3416d0c8
-SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.5_GH0.tar.gz) = 48387
-SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
-SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929
+TIMESTAMP = 1608277642
+SHA256 (xrdp/metalefty-xrdp-v0.9.15.p20201218-70d231b_GH0.tar.gz) = 5e3bb5e5ce1426ecccaeec2f338979c51d6d798100c11a4ee8352f50908e81f8
+SIZE (xrdp/metalefty-xrdp-v0.9.15.p20201218-70d231b_GH0.tar.gz) = 703564
+SHA256 (xrdp/metalefty-librfxcodec-v0.1.5_GH0.tar.gz) = 5710a65a9f877aca5b5bca9f2fb83b5904b59d465ab5c10bcf4ffc2b3416d0c8
+SIZE (xrdp/metalefty-librfxcodec-v0.1.5_GH0.tar.gz) = 48387
+SHA256 (xrdp/metalefty-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
+SIZE (xrdp/metalefty-libpainter-v0.1.1_GH0.tar.gz) = 13929
diff --git a/net/xrdp-devel/files/pkg-deinstall.in b/net/xrdp-devel/files/pkg-deinstall.in
new file mode 100644
index 000000000000..370aa90a5e7d
--- /dev/null
+++ b/net/xrdp-devel/files/pkg-deinstall.in
@@ -0,0 +1,34 @@
+#!/bin/sh
+# vim:ts=4:sw=4:et
+
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2
+    exit 1
+fi
+
+case $2 in
+    DEINSTALL)
+        : nothing to do here
+        ;;
+    POST-DEINSTALL)
+        RSAKEYS=%%PREFIX%%/etc/xrdp/rsakeys.ini
+        PRIVATEKEY=%%PREFIX%%/etc/xrdp/key.pem
+        CERTIFICATE=%%PREFIX%%/etc/xrdp/cert.pem
+
+        # if keys are generated during post-install script, remove it
+        # but do not remove user's keys
+        for f in $RSAKEYS $PRIVATEKEY $CERTIFICATE;
+        do
+            if cmp -s "${f}.sample" "${f}"; then
+                rm -f "${f}"
+            fi
+                rm -f "${f}.sample"
+        done
+        ;;
+    *)
+        echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2
+        exit 1
+        ;;
+esac
+
+exit 0