diff --git a/srcpkgs/dbus/INSTALL b/srcpkgs/dbus/INSTALL
index bbe1cc7f8b5..90b59212572 100644
--- a/srcpkgs/dbus/INSTALL
+++ b/srcpkgs/dbus/INSTALL
@@ -1,27 +1,12 @@
 #
-# This script fixes permissions for dbus-daemon-launch-helper
-# and creates the dbus system user/group.
+# This script fixes permissions for dbus-daemon-launch-helper.
 #
-dbus_launch="./usr/libexec/dbus-daemon-launch-helper"
+dbus_launch=usr/libexec/dbus-daemon-launch-helper
 
 case "${ACTION}" in
 pre)
 	;;
 post)
-	echo "Running ${PKGNAME}-${VERSION} post installation hooks..."
-	if ! getent group dbus >/dev/null; then
-		groupadd -r dbus 2>&1 >/dev/null
-		[ $? -ne 0 ] && exit $?
-		echo "Created dbus system group."
-	fi
-	if ! getent passwd dbus >/dev/null; then
-		useradd -c "System message bus" \
-			-d /var/run/dbus \
-			-s /sbin/nologin -g dbus -r dbus && \
-		passwd -l dbus 2>&1 >/dev/null
-		[ $? -ne 0 ] && exit $?
-		echo "Created dbus system user."
-	fi
 	chown root:dbus ${dbus_launch}
 	chmod 4750 ${dbus_launch}
 	;;
diff --git a/srcpkgs/dbus/REMOVE b/srcpkgs/dbus/REMOVE
deleted file mode 100644
index f03beb8d897..00000000000
--- a/srcpkgs/dbus/REMOVE
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This script removes the dbus user/group.
-#
-case "${ACTION}" in
-pre)
-	if [ "$UPDATE" = "no" ]; then
-		userdel dbus 2>&1 >/dev/null
-		[ $? -eq 0 ] && echo "Removed dbus system user/group."
-	fi
-	;;
-post)
-	;;
-esac
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index 99562a2a8a3..2a9387568a4 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
 # Template file for 'dbus'
 pkgname=dbus
 version=1.2.16
-revision=3
+revision=4
 distfiles="http://dbus.freedesktop.org/releases/dbus/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-selinux --enable-userdb-cache --with-xml=expat
@@ -25,6 +25,7 @@ keep_empty_dirs=yes
 conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
 subpackages="$pkgname-devel $pkgname-libs"
 openrc_services="dbus default"
+system_accounts="dbus"
 
 Add_dependency full	glibc
 Add_dependency full	expat