diff --git a/packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf b/packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf
deleted file mode 100644
index 23f1e1f2f0..0000000000
--- a/packages/mediacenter/xbmc/profile.d/02-xbmc-addon-path.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-################################################################################
-#      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.
-################################################################################
-
-# hack: add addons to $PATH
-  for addon in /storage/.xbmc/addons/*/bin; do
-    if [ -d "$addon" ] ; then
-      PATH="$PATH:$addon"
-    fi
-  done
-
-  for sys in /usr/lib/xbmc/addons/*/bin; do
-    if [ -d "$sys" ] ; then
-      PATH="$PATH:$sys"
-    fi
-  done
-
-export PATH
diff --git a/packages/mediacenter/xbmc/profile.d/02-xbmc-library-path.conf b/packages/mediacenter/xbmc/profile.d/02-xbmc-library-path.conf
deleted file mode 100644
index cbecaa784d..0000000000
--- a/packages/mediacenter/xbmc/profile.d/02-xbmc-library-path.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  Added by Adam Boeglin: adamrb@gmail.com
-#
-#  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.
-################################################################################
-
-LD_LIBRARY_PATH="/usr/lib:/lib"
-
-# hack: add addons to $LD_LIBRARY_PATH
-  for addon in /storage/.xbmc/addons/*/lib; do
-    if [ -d "$addon" ] ; then
-     LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon"
-    fi
-  done
-
-  for sys in /usr/lib/xbmc/addons/*/lib; do
-    if [ -d "$sys" ] ; then
-      LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
-    fi
-  done
-
-export LD_LIBRARY_PATH
diff --git a/packages/mediacenter/xbmc/profile.d/92-xbmc-gputype.conf b/packages/mediacenter/xbmc/profile.d/02-xbmc.conf
similarity index 73%
rename from packages/mediacenter/xbmc/profile.d/92-xbmc-gputype.conf
rename to packages/mediacenter/xbmc/profile.d/02-xbmc.conf
index 775cb74d2a..0aca956eb1 100644
--- a/packages/mediacenter/xbmc/profile.d/92-xbmc-gputype.conf
+++ b/packages/mediacenter/xbmc/profile.d/02-xbmc.conf
@@ -17,20 +17,32 @@
 #  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.
-################################################################################
 
+# PATH
+for addon in /storage/.xbmc/addons/*/bin; do
+  [ -d "$addon" ] && PATH="$PATH:$addon"
+done
+for sys in /usr/lib/xbmc/addons/*/bin; do
+  [ -d "$sys" ] &&  PATH="$PATH:$sys"
+done
+export PATH
+
+# LD_LIBRARY_PATH
+LD_LIBRARY_PATH="/usr/lib:/lib"
+for addon in /storage/.xbmc/addons/*/lib; do
+  [ -d "$addon" ] && LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon"
+done
+for sys in /usr/lib/xbmc/addons/*/lib; do
+  [ -d "$sys" ] && LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
+done
+export LD_LIBRARY_PATH
+
+# GPUTYPE
 GPUTYPE="OTHER"
-
 if [ -x /usr/bin/lspci ]; then
   GPUDEVICE=$(lspci -n | grep 0300)
-
   [ "$(echo $GPUDEVICE | grep 8086)" ] && GPUTYPE="INTEL"   # 8086 == INTEL
   [ "$(echo $GPUDEVICE | grep 10de)" ] && GPUTYPE="NVIDIA"  # 10de == NVIDIA
   [ "$(echo $GPUDEVICE | grep 1002)" ] && GPUTYPE="AMD"     # 1002 == AMD
 fi
-
 export GPUTYPE