diff --git a/init.d/dbus b/init.d/dbus
index 07f1181..4ce4722 100755
--- a/init.d/dbus
+++ b/init.d/dbus
@@ -3,12 +3,13 @@
 #service_respawn=true
 service_command='/usr/bin/dbus-daemon'
 service_args='--system --nofork'
-service_tmpdirs=( '/run/dbus' )
+service_tmpfiles=( '/run/dbus:dir' )
 
 start_pre() {
 	/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
 }
 
 start() {
+	start_pre
 	watchman.start
 }
diff --git a/init.d/vdevd b/init.d/vdevd
index 2d6f7f5..e3e06d4 100755
--- a/init.d/vdevd
+++ b/init.d/vdevd
@@ -3,12 +3,8 @@
 #service_respawn='true'
 service_command='/usr/bin/vdevd'
 service_args='-f /dev'
-service_tmpdirs=( '/run/vdev' )
+service_tmpfiles=( '/run/vdev:dir' '/run/udev:symlink:/dev/metadata/udev' )
 
 start() {
-	if ! [[ -h /run/udev ]]; then
-		ln -s /dev/metadata/udev /run/udev
-	fi
-
 	watchman.start
 }