diff --git a/packages/mediacenter/xbmc-rpi/config/os.openelec.tv/addon.xml b/packages/mediacenter/xbmc-rpi/config/os.openelec.tv/addon.xml
index f786fbfc1d..b1ed65be99 100644
--- a/packages/mediacenter/xbmc-rpi/config/os.openelec.tv/addon.xml
+++ b/packages/mediacenter/xbmc-rpi/config/os.openelec.tv/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="os.openelec.tv" version="@ADDON_OS_VERSION@" provider-name="OpenELEC.tv">
+<addon id="os.openelec.tv" version="@OS_VERSION@" provider-name="OpenELEC.tv">
   <requires>
     <import addon="xbmc.addon" version="1.0"/>
   </requires>
diff --git a/packages/mediacenter/xbmc-rpi/config/repository.openelec.tv/addon.xml b/packages/mediacenter/xbmc-rpi/config/repository.openelec.tv/addon.xml
index 7ebb2ad74b..f4031209a4 100644
--- a/packages/mediacenter/xbmc-rpi/config/repository.openelec.tv/addon.xml
+++ b/packages/mediacenter/xbmc-rpi/config/repository.openelec.tv/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="repository.openelec.tv"
 		name="OpenELEC.tv Mediacenter OS Add-ons"
-		version="1.0.0"
+		version="2.1.0"
 		provider-name="OpenELEC.tv">
 	<extension point="xbmc.addon.repository"
 		name="Official OpenELEC.tv Add-on Repository">
diff --git a/packages/mediacenter/xbmc-rpi/install b/packages/mediacenter/xbmc-rpi/install
index 0f91fb10c0..6c381ae8a9 100755
--- a/packages/mediacenter/xbmc-rpi/install
+++ b/packages/mediacenter/xbmc-rpi/install
@@ -77,7 +77,7 @@ mkdir -p $INSTALL/usr/share/xbmc/media
 
 mkdir -p $INSTALL/usr/share/xbmc/addons
   cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/xbmc/addons
-  $SED "s|@ADDON_OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml
+  $SED "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml
   cp -R $PKG_DIR/config/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
 
diff --git a/projects/RPi/options b/projects/RPi/options
index ff724e563b..00a4a1dbb3 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -316,5 +316,5 @@
   ADDON_SERVER_URL="http://addons.openelec.tv"
 
 # set the addon dirs
-  ADDON_PATH="$OS_VERSION/$PROJECT/$TARGET_ARCH"
+  ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
   ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"