diff --git a/package/dbus/S30dbus b/package/dbus/S30dbus
index 52646cea2f..26772755d7 100644
--- a/package/dbus/S30dbus
+++ b/package/dbus/S30dbus
@@ -7,11 +7,11 @@
 #               and other messages. See http://www.freedesktop.org/software/dbus/
 #
 # processname: dbus-daemon
-# pidfile: /var/run/messagebus.pid
+# pidfile: /run/messagebus.pid
 #
 
 # Create needed directories.
-[ -d /var/run/dbus ] || mkdir -p /var/run/dbus
+[ -d /run/dbus ] || mkdir -p /run/dbus
 [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys
 [ -d /tmp/dbus ] || mkdir -p /tmp/dbus
 
@@ -38,7 +38,7 @@ stop() {
     echo "done"
     if [ $RETVAL -eq 0 ]; then
         rm -f /var/lock/subsys/dbus-daemon
-        rm -f /var/run/messagebus.pid
+        rm -f /run/messagebus.pid
     fi
 }
 
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 5c2a5fb2cc..312c6ba1d8 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -15,7 +15,7 @@ define DBUS_PERMISSIONS
 endef
 
 define DBUS_USERS
-	dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebus user
+	dbus -1 dbus -1 * /run/dbus - dbus DBus messagebus user
 endef
 
 DBUS_DEPENDENCIES = host-pkgconf expat
@@ -27,8 +27,8 @@ DBUS_CONF_OPTS = \
 	--disable-xml-docs \
 	--disable-doxygen-docs \
 	--with-xml=expat \
-	--with-system-socket=/var/run/dbus/system_bus_socket \
-	--with-system-pid-file=/var/run/messagebus.pid
+	--with-system-socket=/run/dbus/system_bus_socket \
+	--with-system-pid-file=/run/messagebus.pid
 
 ifeq ($(BR2_STATIC_LIBS),y)
 DBUS_CONF_OPTS += LIBS='-pthread'