diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index c0110672145c..071093379a0c 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,40 +1,40 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	upower
-PORTVERSION=	0.99.17
-PORTREVISION=	1
+PORTVERSION=	0.99.18
 DISTVERSIONPREFIX=	v
 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
 
 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
 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 a974c38b5dfb..2973455f6372 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648324308
-SHA256 (upower-v0.99.17.tar.bz2) = de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
-SIZE (upower-v0.99.17.tar.bz2) = 139108
+TIMESTAMP = 1653839389
+SHA256 (upower-v0.99.18.tar.bz2) = 125b005d1198fc2bfdd335335f9caf0c4069140a4e3848acbcd6bccebd972284
+SIZE (upower-v0.99.18.tar.bz2) = 141140
diff --git a/sysutils/upower/files/patch-doc_meson.build b/sysutils/upower/files/patch-doc_meson.build
deleted file mode 100644
index 5ec319677ffc..000000000000
--- a/sysutils/upower/files/patch-doc_meson.build
+++ /dev/null
@@ -1,44 +0,0 @@
---- doc/meson.build.orig	2022-03-09 17:46:34 UTC
-+++ doc/meson.build
-@@ -27,21 +27,23 @@ version_xml = configure_file(
-     input: 'version.xml.in',
-     configuration: cdata)
- 
--gnome.gtkdoc('UPower',
--    main_xml: 'upower-docs.xml',
--    src_dir: meson.source_root() / 'libupower-glib',
--    dependencies: [ libupower_glib_dep ],
--    scan_args: ['--rebuild-types', '--rebuild-sections'],
--    content_files: [
--        version_xml,
--        ifaces_refs,
--        'man/UPower.xml',
--        'man/upowerd.xml',
--        'man/upower.xml',
--        '../COPYING',
--    ],
--    ignore_headers: [
--        'config.h',
--    ],
--    install: get_option('gtk-doc')
--)
-+if get_option('gtk-doc')
-+  gnome.gtkdoc('UPower',
-+      main_xml: 'upower-docs.xml',
-+      src_dir: meson.source_root() / 'libupower-glib',
-+      dependencies: [ libupower_glib_dep ],
-+      scan_args: ['--rebuild-types', '--rebuild-sections'],
-+      content_files: [
-+          version_xml,
-+          ifaces_refs,
-+          'man/UPower.xml',
-+          'man/upowerd.xml',
-+          'man/upower.xml',
-+          '../COPYING',
-+      ],
-+      ignore_headers: [
-+          'config.h',
-+      ],
-+      install: get_option('gtk-doc')
-+  )
-+endif
diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist
index d75c1591e6be..ff752c935f34 100644
--- a/sysutils/upower/pkg-plist
+++ b/sysutils/upower/pkg-plist
@@ -1,34 +1,31 @@
 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.so
 lib/libupower-glib.so.3
 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/