diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index e3741d2eae..f0cd08579c 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build boost
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 405242891b..b8d5d5bb09 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 $SCRIPTS/install Python
 $SCRIPTS/install boost
@@ -61,7 +61,6 @@ $SCRIPTS/install samba
 [ "$AVAHI_DAEMON" = yes ] && $SCRIPTS/install avahi
 [ "$WEBSERVER" = yes ] && $SCRIPTS/install libmicrohttpd
 
-PKG_DIR=`find $PACKAGES -type d -name $1`
 PYTHON_LIBDIR="`ls -d $INSTALL/usr/lib/python*`"
 
 mkdir -p $INSTALL/usr/bin
@@ -104,7 +103,7 @@ fi
 
 mkdir -p $INSTALL/usr/share/xbmc/addons
   cp -R $PKG_DIR/addons/os.openelec.tv $INSTALL/usr/share/xbmc/addons
-  $SED "s|@ADDON_OS_VERSION@|$ADDON_OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml
+  $SED "s|@ADDON_OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml
   cp -R $PKG_DIR/addons/repository.openelec.tv $INSTALL/usr/share/xbmc/addons
   $SED "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/xbmc/addons/repository.openelec.tv/addon.xml