diff --git a/packages/mediacenter/xbmc/profile.d/01-xbmc-path.conf b/packages/mediacenter/xbmc/profile.d/01-xbmc-path.conf
new file mode 100644
index 0000000000..0724ee3329
--- /dev/null
+++ b/packages/mediacenter/xbmc/profile.d/01-xbmc-path.conf
@@ -0,0 +1,30 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+# Mediacenter environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+XBMC_HOME="/usr/share/xbmc"
+XBMC_USER_HOME="$HOME/.xbmc"
+
+export XBMC_HOME
+export XBMC_USER_HOME
diff --git a/packages/sysutils/busybox/profile.d/path.conf b/packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf
similarity index 94%
rename from packages/sysutils/busybox/profile.d/path.conf
rename to packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf
index afbebc3dc5..f991a07560 100644
--- a/packages/sysutils/busybox/profile.d/path.conf
+++ b/packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf
@@ -23,10 +23,8 @@
 # evironment variables that are not user defined.
 ################################################################################
 
-PATH="/bin:/sbin:/usr/bin:/usr/sbin"
-
 # hack: add addons to $PATH
-  for addon in /storage/.xbmc/addons/*/bin; do
+  for addon in $XBMC_USER_HOME/addons/*/bin; do
     if [ -d "$addon" ] ; then
       PATH="$PATH:$addon"
     fi
diff --git a/packages/sysutils/busybox/profile.d/librarypath.conf b/packages/mediacenter/xbmc/profile.d/02-xbmc-library-path.conf
similarity index 100%
rename from packages/sysutils/busybox/profile.d/librarypath.conf
rename to packages/mediacenter/xbmc/profile.d/02-xbmc-library-path.conf
diff --git a/packages/mediacenter/xbmc/profile.d/91-xbmc-startdelay.conf b/packages/mediacenter/xbmc/profile.d/91-xbmc-startdelay.conf
new file mode 100644
index 0000000000..dccfb87280
--- /dev/null
+++ b/packages/mediacenter/xbmc/profile.d/91-xbmc-startdelay.conf
@@ -0,0 +1,28 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+# Mediacenter environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+if [ -z "$XBMC_STARTDELAY" ]; then
+  XBMC_STARTDELAY="1000000"
+fi
diff --git a/packages/mediacenter/xbmc/profile.d/xbmc.conf b/packages/mediacenter/xbmc/profile.d/92-xbmc-gputype.conf
similarity index 93%
rename from packages/mediacenter/xbmc/profile.d/xbmc.conf
rename to packages/mediacenter/xbmc/profile.d/92-xbmc-gputype.conf
index 7029bf1bd3..775cb74d2a 100644
--- a/packages/mediacenter/xbmc/profile.d/xbmc.conf
+++ b/packages/mediacenter/xbmc/profile.d/92-xbmc-gputype.conf
@@ -23,14 +23,6 @@
 # evironment variables that are not user defined.
 ################################################################################
 
-if [ -z "$XBMC_STARTDELAY" ]; then
-  XBMC_STARTDELAY="1000000"
-fi
-
-XBMC_HOME="/usr/share/xbmc"
-
-export XBMC_HOME
-
 GPUTYPE="OTHER"
 
 if [ -x /usr/bin/lspci ]; then
diff --git a/packages/sysutils/busybox/profile.d/00-path-variable.conf b/packages/sysutils/busybox/profile.d/00-path-variable.conf
new file mode 100644
index 0000000000..0866b8bc0a
--- /dev/null
+++ b/packages/sysutils/busybox/profile.d/00-path-variable.conf
@@ -0,0 +1,28 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program 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, or (at your option)
+#  any later version.
+#
+#  This Program 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.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+# Core (PATH) environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+PATH="/bin:/sbin:/usr/bin:/usr/sbin"
+
+export PATH