diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 2f0a15509a6b..f73673833477 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xrdp
 PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	GH
@@ -14,12 +14,12 @@ COMMENT=	Open source Remote Desktop Protocol (RDP) server
 
 LICENSE=	GPLv2
 
-USES=		pkgconfig
+USES=		libtool pkgconfig
 USE_XORG=	x11 xfixes
-USE_AUTOTOOLS=	autoconf:env automake:env libtool
+USE_AUTOTOOLS=	autoconf:env automake:env libtoolize
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	xrdp
-USE_LDCONFIG=	${STAGEDIR}${PREFIX}/lib/xrdp
+USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
 GH_ACCOUNT=	neutrinolabs
 GH_PROJECT=	xrdp
@@ -90,11 +90,6 @@ pre-configure:
 	@cd ${WRKSRC} && ./bootstrap
 
 post-install:
-.for f in sesman.ini startwm.sh xrdp.ini
-	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/xrdp/$f ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample ${STAGEDIR}${PREFIX}/etc/xrdp/$f ; \
-	fi
-.endfor
 .for f in ${KEYMAP_FILES}
 	${INSTALL_DATA} ${FILESDIR}/$f ${STAGEDIR}${PREFIX}/etc/xrdp
 .endfor
diff --git a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist
index 06b4122aceee..4fa253e88063 100644
--- a/net/xrdp/pkg-plist
+++ b/net/xrdp/pkg-plist
@@ -6,33 +6,33 @@ bin/xrdp-sesadmin
 bin/xrdp-sesrun
 bin/xrdp-sestest
 lib/xrdp/libcommon.a
-lib/xrdp/libcommon.la
 lib/xrdp/libcommon.so
 lib/xrdp/libcommon.so.0
+lib/xrdp/libcommon.so.0.0.0
 lib/xrdp/libmc.a
-lib/xrdp/libmc.la
 lib/xrdp/libmc.so
 lib/xrdp/libmc.so.0
+lib/xrdp/libmc.so.0.0.0
 lib/xrdp/librdp.a
-lib/xrdp/librdp.la
 lib/xrdp/librdp.so
 lib/xrdp/librdp.so.0
+lib/xrdp/librdp.so.0.0.0
 lib/xrdp/libscp.a
-lib/xrdp/libscp.la
 lib/xrdp/libscp.so
 lib/xrdp/libscp.so.0
+lib/xrdp/libscp.so.0.0.0
 lib/xrdp/libvnc.a
-lib/xrdp/libvnc.la
 lib/xrdp/libvnc.so
 lib/xrdp/libvnc.so.0
+lib/xrdp/libvnc.so.0.0.0
 lib/xrdp/libxrdp.a
-lib/xrdp/libxrdp.la
 lib/xrdp/libxrdp.so
 lib/xrdp/libxrdp.so.0
+lib/xrdp/libxrdp.so.0.0.0
 lib/xrdp/libxup.a
-lib/xrdp/libxup.la
 lib/xrdp/libxup.so
 lib/xrdp/libxup.so.0
+lib/xrdp/libxup.so.0.0.0
 man/man5/sesman.ini.5.gz
 man/man5/xrdp.ini.5.gz
 man/man8/xrdp-sesman.8.gz