diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index 92606363ca6c..77e7bd2849ca 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -1,41 +1,42 @@
 PORTNAME=	x11vnc
-PORTVERSION=	0.9.16
-PORTREVISION=	8
+PORTVERSION=	0.9.17
+PORTREVISION=	0
 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
+LIB_DEPENDS=	libvncserver.so:net/libvncserver \
+		libdrm.so:graphics/libdrm
 
 USES=		cpe iconv pkgconfig jpeg ssl gmake autoreconf xorg
-USE_XORG=	x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \
-		xdmcp xi xorgproto
+USE_XORG=	xcb xau xdmcp ice xcb xorgproto x11 xext xtst xinerama \
+		xrandr xfixes xdamage xcomposite xi xcursor xrender
 # Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE}
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libdrm
 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/distinfo b/net/x11vnc/distinfo
index 1f6ee4121a34..1d1a5545e2c9 100644
--- a/net/x11vnc/distinfo
+++ b/net/x11vnc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546796375
-SHA256 (LibVNC-x11vnc-0.9.16_GH0.tar.gz) = 885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd
-SIZE (LibVNC-x11vnc-0.9.16_GH0.tar.gz) = 1708009
+TIMESTAMP = 1746176960
+SHA256 (LibVNC-x11vnc-0.9.17_GH0.tar.gz) = 3ab47c042bc1c33f00c7e9273ab674665b85ab10592a8e0425589fe7f3eb1a69
+SIZE (LibVNC-x11vnc-0.9.17_GH0.tar.gz) = 1691520
diff --git a/net/x11vnc/files/patch-src_scan.c b/net/x11vnc/files/patch-src_scan.c
deleted file mode 100644
index 8c711d1c2c2c..000000000000
--- a/net/x11vnc/files/patch-src_scan.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/scan.c.orig	2019-01-05 13:22:11 UTC
-+++ src/scan.c
-@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **x
- 
- #if HAVE_XSHM
- 	shm->shmid = shmget(IPC_PRIVATE,
--	    xim->bytes_per_line * xim->height, IPC_CREAT | 0777);
-+	    xim->bytes_per_line * xim->height, IPC_CREAT | 0600);
- 
- 	if (shm->shmid == -1) {
- 		rfbErr("shmget(%s) failed.\n", name);
diff --git a/net/x11vnc/files/patch-util.h b/net/x11vnc/files/patch-util.h
deleted file mode 100644
index 411bc5b2f51f..000000000000
--- a/net/x11vnc/files/patch-util.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/util.h.orig	2019-01-05 13:22:11 UTC
-+++ src/util.h
-@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
- #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
- extern MUTEX(x11Mutex);
- extern MUTEX(scrollMutex);
--MUTEX(clientMutex);
--MUTEX(inputMutex);
--MUTEX(pointerMutex);
-+extern MUTEX(clientMutex);
-+extern MUTEX(inputMutex);
-+extern MUTEX(pointerMutex);
- #endif
- 
- #define X_INIT INIT_MUTEX(x11Mutex)
diff --git a/net/x11vnc/files/patch-x11vnc.c b/net/x11vnc/files/patch-x11vnc.c
deleted file mode 100644
index f8928ddf188f..000000000000
--- a/net/x11vnc/files/patch-x11vnc.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/x11vnc.c.orig	2019-01-05 13:22:11 UTC
-+++ src/x11vnc.c
-@@ -186,6 +186,10 @@ static void tsdo_timeout (int sig) {
- static pid_t ts_tasks[TASKMAX];
- static int ts_taskn = -1;
- 
-+MUTEX(clientMutex);
-+MUTEX(inputMutex);
-+MUTEX(pointerMutex);
-+
- int tsdo(int port, int lsock, int *conn) {
- 	int csock, rsock, i, db = 1;
- 	pid_t pid;