diff --git a/package/dbus/S30dbus-daemon b/package/dbus/S30dbus-daemon
index 3331b11ced..d41aa3b1a5 100644
--- a/package/dbus/S30dbus-daemon
+++ b/package/dbus/S30dbus-daemon
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 DAEMON="dbus-daemon"
-# check-package lib_sysv.Variables
-PIDFILE="/run/messagebus.pid"
+PIDFILE="/var/run/$DAEMON.pid"
 
 start() {
 	printf 'Starting system %s: ' "$DAEMON"
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 061a341363..7b97c7604d 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -33,7 +33,7 @@ DBUS_CONF_OPTS = \
 	--disable-xml-docs \
 	--disable-doxygen-docs \
 	--with-system-socket=/run/dbus/system_bus_socket \
-	--with-system-pid-file=/run/messagebus.pid \
+	--with-system-pid-file=/run/dbus-daemon.pid \
 	--with-session-socket-dir=/tmp \
 	--runstatedir=/run