diff --git a/config/functions b/config/functions
index 8ef06104cc..1c0983231f 100644
--- a/config/functions
+++ b/config/functions
@@ -430,7 +430,6 @@ show_config() {
config_message="$config_message\n $dashes$dashes"
config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
- config_message="$config_message\n - Kodi include language files:\t\t $KODI_LANGUAGE_ADDONS"
config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT"
config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index e7daab7228..6395b4a14c 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -95,9 +95,6 @@
# build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
KODI_SAMBA_SUPPORT="yes"
-# include initial language addons for Kodi (yes / no)
- KODI_LANGUAGE_ADDONS="yes"
-
# build with NFS support (mounting nfs shares via the OS) (yes / no)
NFS_SUPPORT="yes"
diff --git a/packages/mediacenter/kodi-language-addons/package.mk b/packages/mediacenter/kodi-language-addons/package.mk
deleted file mode 100644
index 0862ac7f85..0000000000
--- a/packages/mediacenter/kodi-language-addons/package.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-PKG_NAME="kodi-language-addons"
-PKG_VERSION="ce9947c"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/xbmc/repo-resources"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="mediacenter"
-PKG_SHORTDESC="kodi language add-ons"
-PKG_LONGDESC="kodi language add-ons"
-
-PKG_AUTORECONF="no"
-PKG_IS_ADDON="no"
-
-make_target() {
- :
-}
-
-makeinstall_target() {
- mkdir -p $INSTALL/usr/share/kodi/addons/
- cp -PR $ROOT/$PKG_BUILD/* $INSTALL/usr/share/kodi/addons/
-}
diff --git a/packages/mediacenter/kodi/patches/kodi-999.15-disable-using-tv-menu-language-by-default.patch b/packages/mediacenter/kodi/patches/kodi-999.15-disable-using-tv-menu-language-by-default.patch
new file mode 100644
index 0000000000..6c2893341e
--- /dev/null
+++ b/packages/mediacenter/kodi/patches/kodi-999.15-disable-using-tv-menu-language-by-default.patch
@@ -0,0 +1,12 @@
+diff -Naur a/system/peripherals.xml b/system/peripherals.xml
+--- a/system/peripherals.xml 2016-03-19 01:20:46.000000000 -0700
++++ b/system/peripherals.xml 2016-04-13 11:07:51.605221474 -0700
+@@ -18,7 +18,7 @@
+
+
+
+-
++
+
+
+
diff --git a/packages/virtual/mediacenter/package.mk b/packages/virtual/mediacenter/package.mk
index 8c54961e47..f565c50ea5 100644
--- a/packages/virtual/mediacenter/package.mk
+++ b/packages/virtual/mediacenter/package.mk
@@ -46,8 +46,4 @@ if [ "$MEDIACENTER" = "kodi" ]; then
# other packages
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET LibreELEC-settings"
-
- if [ "$KODI_LANGUAGE_ADDONS" = "yes" ]; then
- PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET kodi-language-addons"
- fi
fi
diff --git a/tools/mkpkg/mkpkg_kodi-language-addons b/tools/mkpkg/mkpkg_kodi-language-addons
deleted file mode 100755
index 0fb08875fc..0000000000
--- a/tools/mkpkg/mkpkg_kodi-language-addons
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-if [ -z "$1" ]; then
- echo "Usage: $0 "
- exit 0
-fi
-
-echo "getting sources..."
- if [ ! -d kodi-language-addons.git ]; then
- git clone --depth=1 -b $1 https://github.com/xbmc/repo-resources.git kodi-language-addons.git
- fi
-
- cd kodi-language-addons.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
-
-echo "copying sources..."
- rm -rf kodi-language-addons-$GIT_REV
- cp -R kodi-language-addons.git kodi-language-addons-$GIT_REV
-
-echo "cleaning sources..."
- cd kodi-language-addons-$GIT_REV
- rm -rf .git
- ls | grep -v resource.language | xargs rm -r
- cd ..
-
-echo "packing sources..."
- tar cvJf kodi-language-addons-$GIT_REV.tar.xz kodi-language-addons-$GIT_REV
-
-echo "remove temporary sourcedir..."
- rm -rf kodi-language-addons-$GIT_REV