diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index 5b290dc69d39..3f32bcbbe925 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	x11vnc
 PORTVERSION=	0.9.16
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	VNC server for use with real X displays
 WWW=		https://github.com/LibVNC/x11vnc
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libvncserver.so:net/libvncserver
 
 USES=		cpe iconv pkgconfig jpeg ssl gmake autoreconf xorg
 USE_XORG=	x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \
 		xdmcp xi xorgproto
 # Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE}
 CPPFLAGS+=	-I${LOCALBASE}/include
 USE_GITHUB=	yes
 GH_ACCOUNT=	LibVNC
 
 CPE_VENDOR=	x11vnc_project
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=	NLS AVAHI DOCS
 OPTIONS_DEFAULT=AVAHI
 NO_OPTIONS_SORT=yes
 NLS_USES=	gettext
 AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 AVAHI_CONFIGURE_OFF=	--without-avahi
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/net/x11vnc/files/patch-ssltools.h b/net/x11vnc/files/patch-ssltools.h
new file mode 100644
index 000000000000..e01cd2738f9e
--- /dev/null
+++ b/net/x11vnc/files/patch-ssltools.h
@@ -0,0 +1,11 @@
+--- src/ssltools.h.orig	2019-01-05 13:22:11 UTC
++++ src/ssltools.h
+@@ -1057,7 +1057,7 @@ char find_display[] = 
+ "#\n"
+ "if [ \"X$FD_XDM\" != \"X\" ]; then\n"
+ "	list=\"\"\n"
+-"	for pair in `echo \"$psout\" | grep '/X.* :[0-9][0-9]* .*-auth' | egrep -v 'startx|xinit' | sed -e 's,^.*/X.* \\(:[0-9][0-9]*\\) .* -auth \\([^ ][^ ]*\\).*$,\\1\\,\\2,' | sort -u`\n"
++"	for pair in `echo \"$psout\" | grep '/X.* :[0-9][0-9]* .*-auth' | egrep -v 'startx|xinit' | sed -e 's,^.*/X.* \\(:[0-9][0-9]*\\).*-auth \\([^ ][^ ]*\\).*$,\\1\\,\\2,' | sort -u`\n"
+ "	do\n"
+ "		da=`echo \"$pair\" | awk -F, '{print $1}'`\n"
+ "		xa=`echo \"$pair\" | awk -F, '{print $2}'`\n"