diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl
index 2d37a2b4..8cf53229 100644
--- a/share/runtime-postinstall.tmpl
+++ b/share/runtime-postinstall.tmpl
@@ -82,6 +82,11 @@ replace "root:\*:" "root::" etc/shadow
     runcmd ssh-keygen -q -C "" -N "" -t dsa  -f ${root}/etc/ssh/ssh_host_dsa_key
     chmod etc/ssh/ssh_host*_key 600
     chmod etc/ssh/ssh_host*_key.pub 644
+    ## var/run is a symlink to tmpfs, so the created dbus directory does not stay
+    remove var/run
+    remove var/lock
+    move run var/run
+    symlink run/lock var/lock
     mkdir var/run/dbus
 %endif