Index: head/audio/pulseaudio-module-xrdp/Makefile
===================================================================
--- head/audio/pulseaudio-module-xrdp/Makefile	(revision 480714)
+++ head/audio/pulseaudio-module-xrdp/Makefile	(revision 480715)
@@ -1,36 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	pulseaudio-module-xrdp
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1
+DISTVERSION=	0.2
 CATEGORIES=	audio
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	PulseAudio module which enables xrdp to use audio redirection
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${NONEXISTENT}:audio/pulseaudio:configure \
-		${LOCALBASE}/include/xrdp_constants.h:net/xrdp
+BUILD_DEPENDS=	${NONEXISTENT}:audio/pulseaudio:configure
 LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
-USES=		autoreconf:build libtool pkgconfig
-GNU_CONFIGURE=	yes
+USES=		autoreconf:build libtool localbase pkgconfig
 USE_GITHUB=	yes
+
+GNU_CONFIGURE=	yes
 GH_ACCOUNT=	neutrinolabs
 GH_PROJECT=	pulseaudio-module-xrdp
 
 PLIST_FILES=	`${PULSE_MODDIR}`/module-xrdp-sink.so \
 		`${PULSE_MODDIR}`/module-xrdp-source.so
 
 CONFIGURE_ARGS=	PULSE_DIR=${WRKDIR}/pulseaudio-`${PULSE_VERSION}`
 
 PULSE_VERSION=	pkg-config --modversion libpulse
 PULSE_MODDIR=	pkg-config --variable=modlibexecdir libpulse
 PULSE_WRKSRC=	${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VWRKSRC
 
 pre-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap
 	@${CP} -r "`${PULSE_WRKSRC}`" ${WRKDIR}
 
 .include <bsd.port.mk>
Index: head/audio/pulseaudio-module-xrdp/distinfo
===================================================================
--- head/audio/pulseaudio-module-xrdp/distinfo	(revision 480714)
+++ head/audio/pulseaudio-module-xrdp/distinfo	(revision 480715)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535076040
-SHA256 (neutrinolabs-pulseaudio-module-xrdp-v0.1_GH0.tar.gz) = 4fb1a946796bc4f8e82f0849a2c181674ae13b16ec96555ff1f9478006b8d918
-SIZE (neutrinolabs-pulseaudio-module-xrdp-v0.1_GH0.tar.gz) = 10957
+TIMESTAMP = 1537858795
+SHA256 (neutrinolabs-pulseaudio-module-xrdp-v0.2_GH0.tar.gz) = 6894af7bb79d76cdd2206a2048a49c99fd0aa73e4142c1c48ac1b4d526d6754a
+SIZE (neutrinolabs-pulseaudio-module-xrdp-v0.2_GH0.tar.gz) = 11476
Index: head/net/xrdp/Makefile
===================================================================
--- head/net/xrdp/Makefile	(revision 480714)
+++ head/net/xrdp/Makefile	(revision 480715)
@@ -1,75 +1,76 @@
 # Created by: alepulver
 # $FreeBSD$
 
 PORTNAME=	xrdp
-PORTVERSION=	0.9.7
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+DISTVERSION=	0.9.8
 PORTEPOCH=	1
 CATEGORIES=	net
 DIST_SUBDIR?=	${PORTNAME}
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	Open source Remote Desktop Protocol (RDP) server
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:devel/nasm
-RUN_DEPENDS=	${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp
+RUN_DEPENDS=	${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \
+		${LOCALBASE}/lib/pulse-11.1/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp
 
 USES=		autoreconf:build jpeg localbase libtool pkgconfig ssl
 USE_XORG=	ice pixman sm x11 xfixes xrandr
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
+
+GNU_CONFIGURE=	yes
 GH_ACCOUNT=	neutrinolabs
 GH_PROJECT=	xrdp librfxcodec:librfxcodec libpainter:libpainter
 GH_TAGNAME=	v0.1.4:librfxcodec v0.1.1:libpainter
 
 CONFIGURE_ARGS=	--localstatedir=/var --enable-strict-locations \
 		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
 		--enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter
 LDFLAGS+=	-lssl
 CONFLICTS=	xrdp-devel[0-9]*
 INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-install pkg-message
 SUB_LIST=	OPENSSLBASE=${OPENSSLBASE}
 
 OPTIONS_DEFINE=	DEBUG FUSE IPV6
 OPTIONS_DEFAULT=	FDKAAC MP3LAME 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=	xrdpdebug
 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
 
 post-extract:
 	# librfxcodec is provided as git submodule
 	@${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/
 	@${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/
 
 pre-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap
 
 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.mk>
Index: head/net/xrdp/distinfo
===================================================================
--- head/net/xrdp/distinfo	(revision 480714)
+++ head/net/xrdp/distinfo	(revision 480715)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1530261600
-SHA256 (xrdp/neutrinolabs-xrdp-v0.9.7_GH0.tar.gz) = 3396479a7b692a0f93bd7951dcfca2c8f033b73bbf55612fb0164ce8a6cef7c2
-SIZE (xrdp/neutrinolabs-xrdp-v0.9.7_GH0.tar.gz) = 665858
+TIMESTAMP = 1537858074
+SHA256 (xrdp/neutrinolabs-xrdp-v0.9.8_GH0.tar.gz) = 5764a3bb5ecdc8b566d03ea6c1526b3dc67802ac7f029485d3e93ffaf09fd4fc
+SIZE (xrdp/neutrinolabs-xrdp-v0.9.8_GH0.tar.gz) = 658830
 SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 8e2d6060aca6d92ebd8b5cd295e9b85b8dd12ec00aacf7e3d351a8dacb56f4f3
 SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 48379
 SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
 SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929