diff --git a/packages/mediacenter/xbmc/tmpfiles.d/z_90_xbmc.conf b/packages/mediacenter/xbmc/tmpfiles.d/z_90_xbmc.conf
index 24bcf7a5b7..327ba7c74f 100644
--- a/packages/mediacenter/xbmc/tmpfiles.d/z_90_xbmc.conf
+++ b/packages/mediacenter/xbmc/tmpfiles.d/z_90_xbmc.conf
@@ -16,4 +16,11 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-d    /run/xbmc     0755 root root - -
+d    /run/xbmc                   0755 root root - -
+d    /storage/.xbmc/userdata     0755 root root - -
+d    /storage/music              0755 root root - -
+d    /storage/pictures           0755 root root - -
+d    /storage/tvshows            0755 root root - -
+d    /storage/videos             0755 root root - -
+d    /storage/screenshots        0755 root root - -
+
diff --git a/packages/mediacenter/xbmc/tmpfiles.d/z_92_xbmc-userdirs.conf b/packages/mediacenter/xbmc/tmpfiles.d/z_92_xbmc-userdirs.conf
deleted file mode 100644
index 62552cdc49..0000000000
--- a/packages/mediacenter/xbmc/tmpfiles.d/z_92_xbmc-userdirs.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-d    /storage/.xbmc/userdata     0755 root root - -
-d    /storage/music              0755 root root - -
-d    /storage/pictures           0755 root root - -
-d    /storage/tvshows            0755 root root - -
-d    /storage/videos             0755 root root - -
-d    /storage/screenshots        0755 root root - -