diff --git a/etc/init.d/dbus b/etc/init.d/dbus
index d25f34d..0b56f7c 100755
--- a/etc/init.d/dbus
+++ b/etc/init.d/dbus
@@ -68,12 +68,7 @@ case "$1" in
 		fi
 		export PATH=$PATH:/usr/X11R7/bin
                 echo -n "Starting dbus messaging system"
-                dbus-launch --config-file /etc/sysconfig/dbus/dbus-1/system.conf >/tmp/dbus_startup && \
-		source /tmp/dbus_startup && \
-		rm /tmp/dbus_startup && \
-		echo $DBUS_SESSION_BUS_PID >/var/run/dbus/pid && \
-		echo "DBUS_SESSION_BUS_ADDRESS='$DBUS_SESSION_BUS_ADDRESS'" \
-		      >/var/run/dbus/address
+		dbus-daemon --system
 		evaluate_retval
                 ;;
 
@@ -85,7 +80,6 @@ case "$1" in
                 echo -n "Stopping dbus messaging system"
 		kill `cat /var/run/dbus/pid` &&
 		rm /var/run/dbus/pid &&
-		rm /var/run/dbus/address
 		evaluate_retval
                 ;;
 
diff --git a/tmp/postinstall b/tmp/postinstall
index 68c1135..74aa997 100644
--- a/tmp/postinstall
+++ b/tmp/postinstall
@@ -41,6 +41,10 @@
 #neue postinstall installiert den in der neuen version erwarteten user messagebus
 #
 
-if ! getent passwd messagebus 2>&1 >/dev/null; then
-	useradd -u 42 messagebus -g daemon -s /bin/false -d /tmp
+if ! getent group messagebus 2>&1 >/dev/null; then
+	groupadd -g 42 messagebus
 fi
+if ! getent passwd messagebus 2>&1 >/dev/null; then
+	useradd -u 42 messagebus -g messagebus -s /bin/false -d /tmp
+fi
+dbus-uuidgen --ensure