diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 4a26b3ea4bfa..01eb42ac9b76 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	upower
-PORTVERSION=	1.90.0
-DISTVERSIONPREFIX=	v
+DISTVERSION=	1.90.0
 CATEGORIES=	sysutils
-MASTER_SITES=	https://gitlab.freedesktop.org/upower/upower/-/archive/${DISTVERSIONFULL}/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	D-Bus daemon for simplifying power management tasks
 WWW=		https://upower.freedesktop.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
-USES=		compiler:c11 gettext gnome localbase meson \
-		pkgconfig tar:bz2
+USES=		compiler:c11 gettext gnome localbase meson pkgconfig
+USE_GITLAB=	yes
+GL_SITE=	https://gitlab.freedesktop.org/
+GL_COMMIT=	d4259c009b3ca1169dfd19231a040c233fc3b58d
 USE_GNOME=	glib20 introspection:build
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Dgtk-doc=false \
 		-Dos_backend=freebsd \
 		-Dlocalstatedir=/var \
 		-Dudevrulesdir=no \
 		-Dudevhwdbdir=no \
 		-Dsystemdsystemunitdir=no \
 		-Didevice=disabled
 LDFLAGS+=	-lkvm
 
 OPTIONS_DEFINE=			MANPAGES
 OPTIONS_DEFAULT=		MANPAGES
 OPTIONS_SUB=			yes
 MANPAGES_BUILD_DEPENDS=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 				docbook-sgml>0:textproc/docbook-sgml \
 				docbook-xml>0:textproc/docbook-xml \
 				gtkdoc-scan:textproc/gtk-doc
 MANPAGES_USE=			GNOME=libxslt:build
 MANPAGES_MESON_TRUE=		man
 
 .include <bsd.port.mk>
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index f0fd8b527289..6435360c5b78 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661608460
-SHA256 (upower-v1.90.0.tar.bz2) = eafa0a367dc0417390984eeb81e9d1a2b449999ba6ad20ed39bf270d0b4e5e77
-SIZE (upower-v1.90.0.tar.bz2) = 129505
+TIMESTAMP = 1665859956
+SHA256 (upower-upower-d4259c009b3ca1169dfd19231a040c233fc3b58d_GL0.tar.gz) = 896302382e01322d9a87c7f4cc4b51092aca428090469db1c143853fd9cd9b84
+SIZE (upower-upower-d4259c009b3ca1169dfd19231a040c233fc3b58d_GL0.tar.gz) = 170265