diff --git a/sysutils/hid-tools/Makefile b/sysutils/hid-tools/Makefile
index d1668fa60d18..6d0dfd0cd51f 100644
--- a/sysutils/hid-tools/Makefile
+++ b/sysutils/hid-tools/Makefile
@@ -1,29 +1,32 @@
 PORTNAME=	hid-tools
-PORTVERSION=	0.2
+DISTVERSION=	0.3.1
 CATEGORIES=	sysutils python
-MASTER_SITES=	https://gitlab.freedesktop.org/libevdev/${PORTNAME}/-/archive/${DISTVERSION}/
 
 MAINTAINER=	wulf@FreeBSD.org
 COMMENT=	Python scripts to manipulate HID data
 WWW=		https://gitlab.freedesktop.org/libevdev/hid-tools
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS_FreeBSD_12=	iichid>=0.0.6:sysutils/iichid
 RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}parse>=0:textproc/py-parse@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pyudev>=0:devel/py-pyudev@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
 			${RUN_DEPENDS_${OPSYS}_${OSREL:R}}
 
-USES=		python:3.6+ shebangfix tar:bz2
+USES=		python:3.6+ shebangfix
+USE_GITLAB=	yes
+GL_SITE=	https://gitlab.freedesktop.org/
+GL_ACCOUNT=	libevdev
+GL_COMMIT=	0f71fd65d83b28b744a2fe0a6cc1e3139921c721
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pypandoc>=0:textproc/py-pypandoc@${PY_FLAVOR}
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/hid-tools/distinfo b/sysutils/hid-tools/distinfo
index 311d21dfc2b1..3e4576e034cb 100644
--- a/sysutils/hid-tools/distinfo
+++ b/sysutils/hid-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612900435
-SHA256 (hid-tools-0.2.tar.bz2) = c0a963f75699d69740ecd10549f3ffe32d620703f3090c5e3c55b9af1d469786
-SIZE (hid-tools-0.2.tar.bz2) = 78530
+TIMESTAMP = 1665854737
+SHA256 (libevdev-hid-tools-0f71fd65d83b28b744a2fe0a6cc1e3139921c721_GL0.tar.gz) = 06b1443cc17ce4f177675cb28a3fa3338fd3a33965e6d7a8ba8de28cd9927cd6
+SIZE (libevdev-hid-tools-0f71fd65d83b28b744a2fe0a6cc1e3139921c721_GL0.tar.gz) = 162075