diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 466377d549f7..a7496e26c5ad 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,37 +1,36 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	upower
-PORTVERSION=	0.99.11
-PORTREVISION=	1
+PORTVERSION=	0.99.12
 CATEGORIES=	sysutils
-MASTER_SITES=	http://upower.freedesktop.org/releases/
+MASTER_SITES=	https://gitlab.freedesktop.org/upower/upower/uploads/244f5966c58773bbd3b4c507c549560f/
 
 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
 USE_GNOME=	glib20 introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--localstatedir=/var \
 		--with-backend=freebsd \
 		--without-idevice
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=			MANPAGES
 OPTIONS_DEFAULT=		MANPAGES
 OPTIONS_SUB=			yes
 MANPAGES_CONFIGURE_ENABLE=	man-pages
 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
 MANPAGES_USE=			GNOME=libxslt:build
 
 .include <bsd.port.mk>
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index 735acc480ed9..9752606b0779 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574185561
-SHA256 (upower-0.99.11.tar.xz) = 64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef
-SIZE (upower-0.99.11.tar.xz) = 430128
+TIMESTAMP = 1624209883
+SHA256 (upower-0.99.12.tar.xz) = 201d211e13a4887d97824fabe8119950230446732a8ed61682e89850f4bb135f
+SIZE (upower-0.99.12.tar.xz) = 423640
diff --git a/sysutils/upower/files/patch-src_freebsd_up-device-supply.c b/sysutils/upower/files/patch-src_freebsd_up-device-supply.c
new file mode 100644
index 000000000000..e6984ea5da0f
--- /dev/null
+++ b/sysutils/upower/files/patch-src_freebsd_up-device-supply.c
@@ -0,0 +1,12 @@
+--- src/freebsd/up-device-supply.c.orig	2021-06-17 09:36:39 UTC
++++ src/freebsd/up-device-supply.c
+@@ -273,7 +273,8 @@ up_device_supply_battery_set_properties (UpDevice *dev
+ 		      "energy", cap,
+ 		      "energy-full", lastfull,
+ 		      "energy-full-design", dcap,
+-		      "energy-rate", rate,
++		      "energy-rate",
++              (battinfo.battinfo.state & ACPI_BATT_STAT_CHARGING) ? -rate : rate,
+ 		      "energy-empty", lcap,
+ 		      "voltage", volt,
+ 		      "capacity", capacity,