diff --git a/sys-apps/systemd/systemd-259.4-r1.ebuild b/sys-apps/systemd/systemd-259.4-r1.ebuild
index ec35d019e03de..7090c6dfb8624 100644
--- a/sys-apps/systemd/systemd-259.4-r1.ebuild
+++ b/sys-apps/systemd/systemd-259.4-r1.ebuild
@@ -544,8 +544,7 @@ pkg_postinst() {
 
 	# Keep this here in case the database format changes so it gets updated
 	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
+	udev_hwdb_update || FAIL=1
 	udev_reload || FAIL=1
 
 	# Bug 465468, make sure locales are respected, and ensure consistency
diff --git a/sys-apps/systemd/systemd-260.1.ebuild b/sys-apps/systemd/systemd-260.1.ebuild
index 4a19c3a01ad73..f6ace7f85a172 100644
--- a/sys-apps/systemd/systemd-260.1.ebuild
+++ b/sys-apps/systemd/systemd-260.1.ebuild
@@ -548,8 +548,7 @@ pkg_postinst() {
 
 	# Keep this here in case the database format changes so it gets updated
 	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
+	udev_hwdb_update || FAIL=1
 	udev_reload || FAIL=1
 
 	# Bug 465468, make sure locales are respected, and ensure consistency
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 3ea27853ed045..8b20783a43c76 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -547,8 +547,7 @@ pkg_postinst() {
 
 	# Keep this here in case the database format changes so it gets updated
 	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
+	udev_hwdb_update || FAIL=1
 	udev_reload || FAIL=1
 
 	# Bug 465468, make sure locales are respected, and ensure consistency