diff --git a/x11/xtrlock/Makefile b/x11/xtrlock/Makefile
index d068c93e4492..ddc3a07b68cb 100644
--- a/x11/xtrlock/Makefile
+++ b/x11/xtrlock/Makefile
@@ -1,35 +1,32 @@
 PORTNAME=	xtrlock
-PORTVERSION=	2.15
-PORTREVISION=	1
+DISTVERSION=	2.17
 CATEGORIES=	x11
 MASTER_SITES=	DEBIAN
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	X Transparent Lock
 WWW=		https://salsa.debian.org/debian/xtrlock
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL-3.txt
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 USES=		cpe localbase tar:xz xorg
 CPE_VENDOR=	${PORTNAME}_project
-USE_XORG=	x11
+USE_XORG=	x11 xorgproto
 
 LIBS+=		-lX11 -lcrypt
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|<crypt.h>|<unistd.h>| ; \
-		 s|<values.h>|<limits.h>|' ${WRKSRC}/xtrlock.c
+	@${REINPLACE_CMD} -e '/<crypt.h>/d ; /<values.h>/d' ${WRKSRC}/xtrlock.c
 
 do-build:
 	(cd ${WRKSRC} && ${CC} ${CFLAGS} -o xtrlock xtrlock.c ${LDFLAGS} ${LIBS})
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xtrlock ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xtrlock.man ${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1
 
 .include <bsd.port.mk>
diff --git a/x11/xtrlock/distinfo b/x11/xtrlock/distinfo
index f1b1395fd033..245af3c064b9 100644
--- a/x11/xtrlock/distinfo
+++ b/x11/xtrlock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628477969
-SHA256 (xtrlock_2.15.tar.xz) = fcde55d06e6822e9bf1adebe6b251ef78db0ccb390fc6fba81a5ddb897f6f755
-SIZE (xtrlock_2.15.tar.xz) = 21316
+TIMESTAMP = 1758089169
+SHA256 (xtrlock_2.17.tar.xz) = 30a7178c7e1cad3bf3e5f58ce0c9a8c4f8990a5a3c2503d110e6bc0329d029c0
+SIZE (xtrlock_2.17.tar.xz) = 21704