diff --git a/x11/evtest/Makefile b/x11/evtest/Makefile
index 0196df5696f2..9258e369f460 100644
--- a/x11/evtest/Makefile
+++ b/x11/evtest/Makefile
@@ -1,31 +1,33 @@
 PORTNAME=	evtest
-DISTVERSIONPREFIX=	${PORTNAME}-
-DISTVERSION=	1.34
+DISTVERSION=	1.35
 CATEGORIES=	x11
-MASTER_SITES=	https://gitlab.freedesktop.org/libevdev/${PORTNAME}/-/archive/${PORTNAME}-${DISTVERSION}/
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Input device event monitor and query tool
 WWW=		https://gitlab.freedesktop.org/libevdev/evtest
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	libevdev.so:devel/libevdev
 
 USES=		autoreconf localbase
 GNU_CONFIGURE=	yes
+USE_GITLAB=	yes
+GL_SITE=	https://gitlab.freedesktop.org/
+GL_ACCOUNT=	libevdev
+GL_COMMIT=	da347a8f88d2e5729dd12d61ee9743f902065b55
 
 CFLAGS+=	-DPACKAGE_VERSION=${PKGVERSION}
 
 PLIST_FILES=	bin/evtest
 
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 			xmlto:textproc/xmlto
 MANPAGES_PLIST_FILES=	man/man1/evtest.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/evtest/distinfo b/x11/evtest/distinfo
index bc330f3ac849..663047d5ddd3 100644
--- a/x11/evtest/distinfo
+++ b/x11/evtest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605183618
-SHA256 (evtest-evtest-1.34.tar.gz) = 0e7a2eeff380af796e5e9b21b6f48fd706c58c931162c151c2c1074bdfeb85c6
-SIZE (evtest-evtest-1.34.tar.gz) = 19954
+TIMESTAMP = 1665907568
+SHA256 (libevdev-evtest-da347a8f88d2e5729dd12d61ee9743f902065b55_GL0.tar.gz) = 40539cec08d54a6c43a0b5d753f98066e03fceb21e424c31810823af47a642b7
+SIZE (libevdev-evtest-da347a8f88d2e5729dd12d61ee9743f902065b55_GL0.tar.gz) = 20768
diff --git a/x11/evtest/files/patch-evtest.c b/x11/evtest/files/patch-evtest.c
deleted file mode 100644
index b46cbf93794d..000000000000
--- a/x11/evtest/files/patch-evtest.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- evtest.c.orig	2019-08-02 18:14:30 UTC
-+++ evtest.c
-@@ -43,7 +43,7 @@
- #include <config.h>
- #endif
- 
--#include <linux/version.h>
-+#include <sys/syslimits.h>
- #include <linux/input.h>
- 
- #include <string.h>
-@@ -875,7 +875,7 @@ static char* scan_devices(void)
- 	char *filename;
- 	int max_device = 0;
- 
--	ndev = scandir(DEV_INPUT_EVENT, &namelist, is_event_device, versionsort);
-+	ndev = scandir(DEV_INPUT_EVENT, &namelist, is_event_device, alphasort);
- 	if (ndev <= 0)
- 		return NULL;
- 
-@@ -923,7 +923,7 @@ static int version(void)
- #ifndef PACKAGE_VERSION
- #define PACKAGE_VERSION "<version undefined>"
- #endif
--	printf("%s %s\n", program_invocation_short_name, PACKAGE_VERSION);
-+	printf("%s %s\n", getprogname(), PACKAGE_VERSION);
- 	return EXIT_SUCCESS;
- }
- 
-@@ -935,12 +935,12 @@ static int usage(void)
- {
- 	printf("USAGE:\n");
- 	printf(" Capture mode:\n");
--	printf("   %s [--grab] /dev/input/eventX\n", program_invocation_short_name);
-+	printf("   %s [--grab] /dev/input/eventX\n", getprogname());
- 	printf("     --grab  grab the device for exclusive access\n");
- 	printf("\n");
- 	printf(" Query mode: (check exit code)\n");
- 	printf("   %s --query /dev/input/eventX <type> <value>\n",
--		program_invocation_short_name);
-+		getprogname());
- 
- 	printf("\n");
- 	printf("<type> is one of: EV_KEY, EV_SW, EV_LED, EV_SND\n");