diff --git a/config/addon/xbmc.broken.xml b/config/addon/xbmc.broken.xml
index 2a4ef0651c..e6c42dce4b 100644
--- a/config/addon/xbmc.broken.xml
+++ b/config/addon/xbmc.broken.xml
@@ -4,7 +4,6 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="3.0.0"/>
 @REQUIRES@
   </requires>
diff --git a/config/addon/xbmc.python.module.xml b/config/addon/xbmc.python.module.xml
index 09e96c7e24..ac82d23763 100644
--- a/config/addon/xbmc.python.module.xml
+++ b/config/addon/xbmc.python.module.xml
@@ -4,7 +4,6 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="3.0.0"/>
 @REQUIRES@
   </requires>
diff --git a/config/addon/xbmc.python.script.xml b/config/addon/xbmc.python.script.xml
index 324b7cf2c4..1a376d0594 100644
--- a/config/addon/xbmc.python.script.xml
+++ b/config/addon/xbmc.python.script.xml
@@ -4,7 +4,6 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="3.0.0"/>
 @REQUIRES@
   </requires>
diff --git a/config/addon/xbmc.service.library.xml b/config/addon/xbmc.service.library.xml
index 5f1fb3bec3..b4c515fbab 100644
--- a/config/addon/xbmc.service.library.xml
+++ b/config/addon/xbmc.service.library.xml
@@ -4,7 +4,6 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="3.0.0"/>
 @REQUIRES@
   </requires>
diff --git a/config/addon/xbmc.service.pluginsource.xml b/config/addon/xbmc.service.pluginsource.xml
index 15022d829c..52c5ebe635 100644
--- a/config/addon/xbmc.service.pluginsource.xml
+++ b/config/addon/xbmc.service.pluginsource.xml
@@ -4,7 +4,6 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="3.0.0"/>
 @REQUIRES@
   </requires>
diff --git a/config/addon/xbmc.service.xml b/config/addon/xbmc.service.xml
index 707283ecfd..4283ce5d77 100644
--- a/config/addon/xbmc.service.xml
+++ b/config/addon/xbmc.service.xml
@@ -4,7 +4,6 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="3.0.0"/>
 @REQUIRES@
   </requires>
diff --git a/distributions/LibreELEC/version b/distributions/LibreELEC/version
index f6e228f73a..e107fe9540 100644
--- a/distributions/LibreELEC/version
+++ b/distributions/LibreELEC/version
@@ -5,4 +5,4 @@
   OS_VERSION="9.80"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="9.80.5"
+  ADDON_VERSION="9.80.6"
diff --git a/packages/addons/script/script.config.vdr/package.mk b/packages/addons/script/script.config.vdr/package.mk
index 6c848d927b..77eab52076 100644
--- a/packages/addons/script/script.config.vdr/package.mk
+++ b/packages/addons/script/script.config.vdr/package.mk
@@ -21,7 +21,6 @@ PKG_ADDON_TYPE="dummy"
 
 make_target() {
   sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
-      -e "s|@OS_VERSION@|$OS_VERSION|g" \
       -i addon.xml
 }
 
diff --git a/packages/addons/script/script.config.vdr/sources/addon.xml b/packages/addons/script/script.config.vdr/sources/addon.xml
index 799a9f6ab4..6223e88a10 100644
--- a/packages/addons/script/script.config.vdr/sources/addon.xml
+++ b/packages/addons/script/script.config.vdr/sources/addon.xml
@@ -4,7 +4,6 @@
        version="@ADDON_VERSION@"
        provider-name="Team LibreELEC">
    <requires>
-     <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
      <import addon="xbmc.python" version="3.0.0"/>
   </requires>
   <extension library="default.py" point="xbmc.python.pluginsource">
diff --git a/packages/addons/service/touchscreen/addon.xml b/packages/addons/service/touchscreen/addon.xml
index 305ef194e6..78f0e7d878 100644
--- a/packages/addons/service/touchscreen/addon.xml
+++ b/packages/addons/service/touchscreen/addon.xml
@@ -4,7 +4,6 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="3.0.0"/>
 @REQUIRES@
   </requires>
diff --git a/packages/addons/service/tvheadend42/addon.xml b/packages/addons/service/tvheadend42/addon.xml
index 58ba48b3ca..92b199becf 100644
--- a/packages/addons/service/tvheadend42/addon.xml
+++ b/packages/addons/service/tvheadend42/addon.xml
@@ -4,7 +4,6 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="3.0.0"/>
 @REQUIRES@
   </requires>
diff --git a/packages/mediacenter/kodi/config/os.libreelec.tv/addon.xml b/packages/mediacenter/kodi/config/os.libreelec.tv/addon.xml
deleted file mode 100644
index 6d30d320c4..0000000000
--- a/packages/mediacenter/kodi/config/os.libreelec.tv/addon.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="os.libreelec.tv" version="@OS_VERSION@" provider-name="LibreELEC.tv">
-  <requires>
-    <import addon="xbmc.addon" version="12.0"/>
-  </requires>
-</addon>
diff --git a/packages/mediacenter/kodi/config/os.openelec.tv/addon.xml b/packages/mediacenter/kodi/config/os.openelec.tv/addon.xml
deleted file mode 100644
index 206659f9da..0000000000
--- a/packages/mediacenter/kodi/config/os.openelec.tv/addon.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="os.openelec.tv" version="@OS_VERSION@" provider-name="OpenELEC.tv">
-  <requires>
-    <import addon="xbmc.addon" version="12.0"/>
-  </requires>
-</addon>
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 0e1fa55fd6..5f38abbc2e 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -276,10 +276,6 @@ post_makeinstall_target() {
     ln -sf /usr/bin/pastekodi $INSTALL/usr/bin/pastecrash
 
   mkdir -p $INSTALL/usr/share/kodi/addons
-    cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/kodi/addons
-    sed -e "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/kodi/addons/os.openelec.tv/addon.xml
-    cp -R $PKG_DIR/config/os.libreelec.tv $INSTALL/usr/share/kodi/addons
-    sed -e "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/kodi/addons/os.libreelec.tv/addon.xml
     cp -R $PKG_DIR/config/repository.libreelec.tv $INSTALL/usr/share/kodi/addons
     sed -e "s|@ADDON_URL@|$ADDON_URL|g" -i $INSTALL/usr/share/kodi/addons/repository.libreelec.tv/addon.xml
     sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" -i $INSTALL/usr/share/kodi/addons/repository.libreelec.tv/addon.xml
@@ -316,8 +312,6 @@ post_makeinstall_target() {
   xmlstarlet ed -L -d "/addons/addon[text()='service.xbmc.versioncheck']" $ADDON_MANIFEST
   xmlstarlet ed -L -d "/addons/addon[text()='skin.estouchy']" $ADDON_MANIFEST
   xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "repository.kodi.game" $ADDON_MANIFEST
-  xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "os.libreelec.tv" $ADDON_MANIFEST
-  xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "os.openelec.tv" $ADDON_MANIFEST
   xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "repository.libreelec.tv" $ADDON_MANIFEST
   if [ -n "$DISTRO_PKG_SETTINGS" ]; then
     xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "$DISTRO_PKG_SETTINGS_ID" $ADDON_MANIFEST