diff --git a/packages/mediacenter/xbmc/tmpfiles.d/xbmc.conf b/packages/mediacenter/xbmc/tmpfiles.d/z_90_xbmc.conf
similarity index 100%
rename from packages/mediacenter/xbmc/tmpfiles.d/xbmc.conf
rename to packages/mediacenter/xbmc/tmpfiles.d/z_90_xbmc.conf
diff --git a/packages/mediacenter/xbmc/tmpfiles.d/xbmc-userdirs.conf b/packages/mediacenter/xbmc/tmpfiles.d/z_92_xbmc-userdirs.conf
similarity index 100%
rename from packages/mediacenter/xbmc/tmpfiles.d/xbmc-userdirs.conf
rename to packages/mediacenter/xbmc/tmpfiles.d/z_92_xbmc-userdirs.conf
diff --git a/packages/network/bluez/tmpfiles.d/bluez.conf b/packages/network/bluez/tmpfiles.d/z_05_bluez.conf
similarity index 100%
rename from packages/network/bluez/tmpfiles.d/bluez.conf
rename to packages/network/bluez/tmpfiles.d/z_05_bluez.conf
diff --git a/packages/network/connman/tmpfiles.d/connman.conf b/packages/network/connman/tmpfiles.d/z_03_connman.conf
similarity index 100%
rename from packages/network/connman/tmpfiles.d/connman.conf
rename to packages/network/connman/tmpfiles.d/z_03_connman.conf
diff --git a/packages/network/openssh/tmpfiles.d/openssh.conf b/packages/network/openssh/tmpfiles.d/z_04_openssh.conf
similarity index 100%
rename from packages/network/openssh/tmpfiles.d/openssh.conf
rename to packages/network/openssh/tmpfiles.d/z_04_openssh.conf
diff --git a/packages/sysutils/busybox/tmpfiles.d/01_busybox.conf b/packages/sysutils/busybox/tmpfiles.d/z_01_busybox.conf
similarity index 87%
rename from packages/sysutils/busybox/tmpfiles.d/01_busybox.conf
rename to packages/sysutils/busybox/tmpfiles.d/z_01_busybox.conf
index e2359ed87f..2940b8acd2 100644
--- a/packages/sysutils/busybox/tmpfiles.d/01_busybox.conf
+++ b/packages/sysutils/busybox/tmpfiles.d/z_01_busybox.conf
@@ -16,12 +16,8 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-d    /var/cache     0755 root root - -
-d    /var/lib       0755 root root - -
 d    /var/lock      0755 root root - -
-d    /var/log       0755 root root - -
 d    /var/media     0755 root root - -
-L    /var/run       - - - - /run
 
 f    /var/run/utmp  1777 root root - -
 d    /storage/.cache/services  0755 root root - -
diff --git a/packages/sysutils/dbus/tmpfiles.d/dbus.conf b/packages/sysutils/dbus/tmpfiles.d/z_02_dbus.conf
similarity index 100%
rename from packages/sysutils/dbus/tmpfiles.d/dbus.conf
rename to packages/sysutils/dbus/tmpfiles.d/z_02_dbus.conf
diff --git a/packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf b/packages/sysutils/remote/eventlircd/tmpfiles.d/z_62_eventlircd.conf
similarity index 100%
rename from packages/sysutils/remote/eventlircd/tmpfiles.d/62_eventlircd.conf
rename to packages/sysutils/remote/eventlircd/tmpfiles.d/z_62_eventlircd.conf
diff --git a/packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf b/packages/sysutils/remote/lirc/tmpfiles.d/z_61_lirc.conf
similarity index 100%
rename from packages/sysutils/remote/lirc/tmpfiles.d/61_lirc.conf
rename to packages/sysutils/remote/lirc/tmpfiles.d/z_61_lirc.conf
diff --git a/packages/sysutils/systemd/tmpfiles.d/openelec.conf b/packages/sysutils/systemd/tmpfiles.d/z_01_openelec.conf
similarity index 95%
rename from packages/sysutils/systemd/tmpfiles.d/openelec.conf
rename to packages/sysutils/systemd/tmpfiles.d/z_01_openelec.conf
index af558c5c3a..f61bd9c102 100644
--- a/packages/sysutils/systemd/tmpfiles.d/openelec.conf
+++ b/packages/sysutils/systemd/tmpfiles.d/z_01_openelec.conf
@@ -17,4 +17,4 @@
 ################################################################################
 
 d    /run/openelec       0755 root root - -
-d    /run/openelec/debug 0755 root root - -
\ No newline at end of file
+d    /run/openelec/debug 0755 root root - -
diff --git a/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf b/packages/x11/xserver/xorg-server/tmpfiles.d/z_90_xorg-server.conf
similarity index 96%
rename from packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf
rename to packages/x11/xserver/xorg-server/tmpfiles.d/z_90_xorg-server.conf
index 02a337f78e..7c0959a1ff 100644
--- a/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf
+++ b/packages/x11/xserver/xorg-server/tmpfiles.d/z_90_xorg-server.conf
@@ -17,4 +17,3 @@
 ################################################################################
 
 d    /var/cache/xkb  0755 root root - -
-d    /var/lib        0755 root root - -