diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 0f87c9811dc2..fb0a4044d6f6 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,37 +1,39 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	upower
-PORTVERSION=	0.99.13
-PORTREVISION=	1
+PORTVERSION=	0.99.17
+DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
-MASTER_SITES=	https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/
+MASTER_SITES=	https://gitlab.freedesktop.org/upower/upower/-/archive/${DISTVERSIONFULL}/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	D-Bus daemon for simplifying power management tasks
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
-USES=		compiler:c11 gettext gmake gnome libtool localbase pathfix \
-		pkgconfig tar:xz
+USES=		compiler:c11 gettext gnome localbase meson \
+		pkgconfig tar:bz2
 USE_GNOME=	glib20 introspection:build
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--localstatedir=/var \
-		--with-backend=freebsd \
-		--without-idevice
-INSTALL_TARGET=	install-strip
+MESON_ARGS=	-Dgtk-doc=false \
+		-Dos_backend=freebsd \
+		-Dlocalstatedir=/var \
+		-Dudevrulesdir=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
+				docbook-xml>0:textproc/docbook-xml \
+				gtkdoc-scan:textproc/gtk-doc
 MANPAGES_USE=			GNOME=libxslt:build
-MANPAGES_CONFIGURE_ENABLE=	man-pages
+MANPAGES_MESON_TRUE=		man
 
 .include <bsd.port.mk>
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index d7b7bd9e136d..a974c38b5dfb 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630081471
-SHA256 (upower-0.99.13.tar.xz) = 5cad70f91540cc7dc121cb17e0ad645e5e663c8682f60a7be42ee38cd7b23d7a
-SIZE (upower-0.99.13.tar.xz) = 448876
+TIMESTAMP = 1648324308
+SHA256 (upower-v0.99.17.tar.bz2) = de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
+SIZE (upower-v0.99.17.tar.bz2) = 139108
diff --git a/sysutils/upower/files/patch-meson.build b/sysutils/upower/files/patch-meson.build
new file mode 100644
index 000000000000..9108eefe6942
--- /dev/null
+++ b/sysutils/upower/files/patch-meson.build
@@ -0,0 +1,11 @@
+--- meson.build.orig	2022-03-09 17:46:34 UTC
++++ meson.build
+@@ -105,7 +105,7 @@ endif
+ config_h = configure_file(output: 'config.h', configuration: cdata)
+ 
+ subdir('etc')
+-subdir('rules')
++#subdir('rules')
+ subdir('po')
+ subdir('dbus')
+ subdir('libupower-glib')
diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist
index be9fb77fb239..d75c1591e6be 100644
--- a/sysutils/upower/pkg-plist
+++ b/sysutils/upower/pkg-plist
@@ -1,35 +1,34 @@
 bin/upower
 etc/UPower/UPower.conf
 include/libupower-glib/up-autocleanups.h
 include/libupower-glib/up-client.h
 include/libupower-glib/up-device.h
 include/libupower-glib/up-history-item.h
 include/libupower-glib/up-stats-item.h
 include/libupower-glib/up-types.h
 include/libupower-glib/up-version.h
 include/libupower-glib/up-wakeup-item.h
 include/libupower-glib/up-wakeups.h
 include/libupower-glib/upower.h
 lib/girepository-1.0/UPowerGlib-1.0.typelib
-lib/libupower-glib.a
 lib/libupower-glib.so
 lib/libupower-glib.so.3
-lib/libupower-glib.so.3.0.1
+lib/libupower-glib.so.3.1.0
 libdata/pkgconfig/upower-glib.pc
 libexec/upowerd
 %%MANPAGES%%man/man1/upower.1.gz
 %%MANPAGES%%man/man7/UPower.7.gz
 %%MANPAGES%%man/man8/upowerd.8.gz
 share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.xml
 share/dbus-1/system.d/org.freedesktop.UPower.conf
 share/dbus-1/system-services/org.freedesktop.UPower.service
 share/gir-1.0/UPowerGlib-1.0.gir
 share/locale/fr/LC_MESSAGES/upower.mo
 share/locale/it/LC_MESSAGES/upower.mo
 share/locale/pl/LC_MESSAGES/upower.mo
 share/locale/sv/LC_MESSAGES/upower.mo
 @dir /var/lib/upower
 @dir /var/lib/