diff --git a/hardware/powermanagement/upower/actions.py b/hardware/powermanagement/upower/actions.py
index d6a97c5e6f..b0d54ed22c 100644
--- a/hardware/powermanagement/upower/actions.py
+++ b/hardware/powermanagement/upower/actions.py
@@ -15,6 +15,7 @@ def setup():
     #pisitools.dosed("configure", "DISABLE_DEPRECATED", deleteLine=True)
     mesontools.configure("-Dgtk-doc=false \
                           -Dudevrulesdir=/lib/udev \
+                          -Dudevhwdbdir=/etc/udev/hwdb.d \
                           -Dintrospection=enabled \
                           -Dsystemdsystemunitdir=no")
 def build():
diff --git a/hardware/powermanagement/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch b/hardware/powermanagement/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch
new file mode 100644
index 0000000000..feafa87e97
--- /dev/null
+++ b/hardware/powermanagement/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch
@@ -0,0 +1,31 @@
+Bug: https://bugs.gentoo.org/848525
+
+From aa646fa0ca3e164b09949c546796ec50433b748d Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 17 May 2022 16:02:49 +0200
+Subject: [PATCH] meson: Allow unittest inspector to fail
+
+It is only used to make the test output nicer, and it is completely fine
+to fail.
+
+Closes: #187
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index b49d5f0..2e1edd1 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -124,7 +124,7 @@ if os_backend == 'linux' and gobject_introspection.found()
+ 
+     python3 = find_program('python3')
+     unittest_inspector = find_program('linux/unittest_inspector.py')
+-    r = run_command(unittest_inspector, files('linux/integration-test.py'), check: true)
++    r = run_command(unittest_inspector, files('linux/integration-test.py'), check: false)
+     unit_tests = r.stdout().strip().split('\n')
+ 
+     foreach ut: unit_tests
+-- 
+2.35.1
+
diff --git a/hardware/powermanagement/upower/pspec.xml b/hardware/powermanagement/upower/pspec.xml
index 446fe81b4f..be7ec476ab 100644
--- a/hardware/powermanagement/upower/pspec.xml
+++ b/hardware/powermanagement/upower/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>Power Management Service</Summary>
         <Description>upower provides a daemon, API and command line tools for managing power devices attached to the system.</Description>
-        <Archive sha1sum="d6c615fc2400465e1197b36c878ece290e1efc11" type="tarbz2">https://gitlab.freedesktop.org/upower/upower/-/archive/v0.99.17/upower-v0.99.17.tar.bz2</Archive>
+        <Archive sha1sum="a7e4737fdc9e632016518f90bb28f2bae05cffda" type="tarbz2">https://gitlab.freedesktop.org/upower/upower/-/archive/v0.99.18/upower-v0.99.18.tar.bz2</Archive>
         <AdditionalFiles>
             <AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
         </AdditionalFiles>
@@ -35,7 +35,7 @@
         </BuildDependencies>
         <Patches>
             <Patch level="1">add-tr.patch</Patch>
-<!--             <Patch level="1">0001-linux-Add-support-for-iPhone-XR-XS-models.patch</Patch> -->
+            <Patch level="1">0.99.18-meson-Allow-unittest-inspector-to-fail.patch</Patch>
 <!--             <Patch level="1">0001-build-Use-a-newer-libplist-if-available.patch</Patch> -->
         </Patches>
     </Source>
@@ -57,6 +57,7 @@
             <Path fileType="data">/lib</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="data">/etc/dbus-1</Path>
+            <Path fileType="config">/etc/udev/hwdb.d/95-upower-hid.hwdb</Path>
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="config">/etc/UPower</Path>
@@ -92,6 +93,13 @@
     </Package>
 
     <History>
+        <Update release="11">
+            <Date>2022-06-03</Date>
+            <Version>0.99.18</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="10">
             <Date>2022-03-21</Date>
             <Version>0.99.17</Version>