diff --git a/packages/compress/lz4/package.mk b/packages/compress/lz4/package.mk
index 788c597cc6..bf5485179c 100644
--- a/packages/compress/lz4/package.mk
+++ b/packages/compress/lz4/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="lz4"
-PKG_VERSION="1.8.0"
-PKG_SHA256="2ca482ea7a9bb103603108b5a7510b7592b90158c151ff50a28f1ca8389fccf6"
+PKG_VERSION="1.8.2"
+PKG_SHA256="0963fbe9ee90acd1d15e9f09e826eaaf8ea0312e854803caf2db0a6dd40f4464"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lz4/lz4"
diff --git a/packages/compress/xz/package.mk b/packages/compress/xz/package.mk
index 9e58a1432a..2a2f633048 100644
--- a/packages/compress/xz/package.mk
+++ b/packages/compress/xz/package.mk
@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="xz"
-PKG_VERSION="5.2.3"
-PKG_SHA256="fd9ca16de1052aac899ad3495ad20dfa906c27b4a5070102a2ec35ca3a4740c1"
+PKG_VERSION="5.2.4"
+PKG_SHA256="3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://tukaani.org/xz/"
diff --git a/packages/devel/libfmt/package.mk b/packages/devel/libfmt/package.mk
index 2208cfb3d3..0359667959 100644
--- a/packages/devel/libfmt/package.mk
+++ b/packages/devel/libfmt/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libfmt"
-PKG_VERSION="3.0.2"
-PKG_SHA256="fa4a062897b2f3712badfdb8583e6d938252e1156cb5705c3af87705dfef3957"
+PKG_VERSION="5.1.0"
+PKG_SHA256="73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="https://github.com/fmtlib/fmt"
diff --git a/packages/devel/pcre/package.mk b/packages/devel/pcre/package.mk
index 6b36599994..9a731c4e71 100644
--- a/packages/devel/pcre/package.mk
+++ b/packages/devel/pcre/package.mk
@@ -1,13 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pcre"
-PKG_VERSION="8.40"
-PKG_SHA256="00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4"
+PKG_VERSION="8.42"
+PKG_SHA256="2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.pcre.org/"
-PKG_URL="http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://ftp.pcre.org/pub/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_HOST=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="devel"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk
index 3c46fec599..f466b66af0 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.argustv"
-PKG_VERSION="1459cead0b2a9090bcc8377ccea214bd2a844983"
-PKG_SHA256="226642f7b17435879b908efba833bec7ac7881e563dd39b25376d4a2758cb19f"
+PKG_VERSION="c57a5c4e7dae8c2a7035c17dbc5d36eebcbcf130"
+PKG_SHA256="534ada5c0a9bbd5dbc5e8d9e56e3b19f7413c528261ab7fcb3fae1060e43af02"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk
index 23d2963bb9..b46543d1e4 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.dvblink"
-PKG_VERSION="c66203b448253326a3ef2938c0a4360cec74d0c3"
-PKG_SHA256="4a50319e49c13773a3d6b41b506c0a23f4c0416f5e48469612a15b00faefe9a5"
+PKG_VERSION="72ef8a0e9a939ec770552300c39b791c0093f385"
+PKG_SHA256="9f719a69fb63db093d1e6b2763f8ddc12a2b2e147e62ce80245d8dbd97192ea5"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk
index 608c59b5cb..30bb3fd06b 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.dvbviewer"
-PKG_VERSION="c3ceb0bcfb074f4ee209baa7b36e9b551bd882f8"
-PKG_SHA256="64867671683b416b4b331d9faac22718e45caa7821eb1a670cb9f391e8d71fb5"
+PKG_VERSION="b63e867740a61cf5a9c530a636069fa8ec1e20c7"
+PKG_SHA256="51b51ef6ecb7ed0bfb774e6d17ede6621e84aea755038ed938ffc730e80d1d60"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk
index 102a1d922f..aa734c6249 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.hdhomerun"
-PKG_VERSION="ced70bda3c6bfcd9716d7fe5777d7a9bc5d0a9a9"
-PKG_SHA256="408fd5abce1138967becfa57b1b78d1e2aea20b82cecf4bbc0cb9cf16b43919f"
+PKG_VERSION="7a607c965f4ee6f9276d1670581927581921bc23"
+PKG_SHA256="5a1657175e931851e3ef606a443cc2b7b7cd88e1ba4fef82d8da598396b82234"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
index 7c23f38c09..8b77d569b7 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.hts"
-PKG_VERSION="0f06313fa9af8b8160aba4b3a9c91d87179842d6"
-PKG_SHA256="399487e0c1480b1278337b9ff3ceaf58e35672bcccdba1f694d6cc8644e463d1"
+PKG_VERSION="7c7c6cefc785ccd5ee7015eb997e0c688258a4e0"
+PKG_SHA256="c471894f9efe5b69bc10ab2bcff4d808e760cddb07f18e1a320c7f361d2b5b43"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk
index 12106c7e5b..a229d1fda4 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.iptvsimple"
-PKG_VERSION="55637c84d120730317edff6eaf8f1bbd3211e59d"
-PKG_SHA256="5b415fe54bc9248e83792f02b8ecc73b6e22051d7aaae70eebdfc0b8d7da71d6"
+PKG_VERSION="e8effadebc349d38f7b8a2c190baa72ebf74b6fe"
+PKG_SHA256="7ca8db0917323cee806dda70790275ad496178aa0ac3b660d1ecc5b73c4dfcf0"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
index 7e1368195c..c05d617b94 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.mediaportal.tvserver"
-PKG_VERSION="ca4f4dbf51c7b22ff3341ea75fa143daa7e199a0"
-PKG_SHA256="50a56a89b1d64920e31c9ce2755d60db29948c926086f9e075f4a3cb5a86f7b1"
+PKG_VERSION="cc3eaf05e1459bc9981b00c6bed32adddca53630"
+PKG_SHA256="28946df252cd1f29d34fec2fc7448d8b12a9e3249efea27ddc2284d301113b94"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk
index 84a341787f..a87329a799 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.nextpvr"
-PKG_VERSION="6f0515bb660e1e7f812051a2a64d7c0affd0057c"
-PKG_SHA256="2df81507db75722520f40d6bd4bd7363e49cbc84e6002f986f05c25e9bfb1878"
+PKG_VERSION="441eddef8a9d15d317db78b5927119d572aae9a0"
+PKG_SHA256="dfcf878ed2057126e4244b85dedf6e17b8e384d749d82dbea2433636b0a51a74"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk
index f5370a6fe7..e48a9676f8 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.pctv"
-PKG_VERSION="32d4b669504b0f823f5c1dd1b35dc9582cc10a02"
-PKG_SHA256="509d9fe09208d60f80e064aa5a13cfcf0c1be435e49f95628f159d6647f26a49"
+PKG_VERSION="9d95bab1d49b80bb11b86373ca7a44838d12adb5"
+PKG_SHA256="ebbf7df31a8a106d87edd4fe5e07b8c0f77c0f36091af0830b0a146fd50f3bdc"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk
index bc6b454c74..595ecb877d 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.sledovanitv.cz"
-PKG_VERSION="6b4bad62c153bdba1b3787beda541ef0458dc6c8"
-PKG_SHA256="36c21c9bf57624454b9d9b4334313379d8529f9761cc7cb14f195f81077c7bf2"
+PKG_VERSION="293c7fce7e811d305caf43e55019534c093df533"
+PKG_SHA256="f405aed37bcddc85010388e47bfccca61efa7a5b32fcedee15e0c118e44f650c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk
index 14b42d67b3..f91bd850a4 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.stalker"
-PKG_VERSION="f84483cb62a3dd0fe416312e5cde64bb711e0439"
-PKG_SHA256="56259a25538981dffd69f3f93821255636bbb1f38a95748377309a6ee8da7ca4"
+PKG_VERSION="2eb66d11f8f90040824067d41919cf53f6267228"
+PKG_SHA256="ed0b0bf1a5a8bb207574c913850955f25af8ec25a7e7d4c3c75964e3933daa63"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.teleboy/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.teleboy/package.mk
index f39d7b1999..7c24beb45b 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.teleboy/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.teleboy/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.teleboy"
-PKG_VERSION="04605363edc6079578dabd2f5a7a817de60851e1"
-PKG_SHA256="c0e3a3410af7e31124d5c821847864e1cd8674f86fbfad15b95c29fad5724b24"
+PKG_VERSION="0f3ccfd885e9058876a4446132a78c6d1c1b3be6"
+PKG_SHA256="7f656209c2de0f25252b226ae9afb952485a001eb9e4c88e3277f5cca5bf37b0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk
index 0d9a9079f7..9e6dd1bffc 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.vbox"
-PKG_VERSION="c115a14e1f55e625739377ec90ca70cb56da2511"
-PKG_SHA256="92cafc88e18300609062256b4a9944ad872b65c85f304b3dbbe30f30e4956be3"
+PKG_VERSION="40ca81f334443f3a784231765f9bc0287014bf95"
+PKG_SHA256="7634eb9271f7c8b1097640e0936ad82e3ac168aa84cacc6b3abb9135c945e755"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
index bae614b959..8e53a00979 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.vuplus"
-PKG_VERSION="75179a3ca2a9b6acf5195b69f859cd9f2c459eda"
-PKG_SHA256="4aa46b8de08e8d1c14400cbb5e9ca7c91b04498fcf60d9ac1b09af2aee6e9a91"
+PKG_VERSION="016a4ff6d8c607a0119e825605f8f83a073fc662"
+PKG_SHA256="c9a42c2f208cb4c0b833c93397e47463b1314099203dce4e64f3967ff79907dd"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk
index f1cd5cdea0..3d5058f655 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.wmc"
-PKG_VERSION="b5fe5a1e483063541deee9a6202df36a6ef6b283"
-PKG_SHA256="5efca596e3e392e099ffe992032b76cccba06b39e98c8e419e24631a1d6a7edc"
+PKG_VERSION="292a819f22189706473535e7c390d77a6c5d5cd7"
+PKG_SHA256="8d1df1297fab867434e7a81cdf83abfbc38be72e5f5832acee2a2bc7cfb0e5a7"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk b/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk
index b3eb6232ca..0f38172a5f 100644
--- a/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vfs.libarchive"
-PKG_VERSION="fdc744118e9246ac7c6f58a1b8b47bd08a31013c"
-PKG_SHA256="6969b5c879ee5b681211c3f693315f2ad623558e16ca0fa5f8c15cc0f9055b7b"
+PKG_VERSION="f93a5f3eccdf4b3dbf1ad5ad63614c3ccac0c2fe"
+PKG_SHA256="50a6cecdb121fd5098e70d772d55de1102362c1f7b9579ce9d579447bae81407"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/vfs.sftp/package.mk b/packages/mediacenter/kodi-binary-addons/vfs.sftp/package.mk
index d3643a2f37..02dc146bf3 100644
--- a/packages/mediacenter/kodi-binary-addons/vfs.sftp/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/vfs.sftp/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vfs.sftp"
-PKG_VERSION="990503727ed0b748daf474a1be8651c2e8e27b39"
-PKG_SHA256="8ad7bf66c14aed5d253a2769bc6c0de31b1201193c31e128bf0fc1a77fe7e226"
+PKG_VERSION="e69acc9b7bd73e068697e3e02816ad074d301cce"
+PKG_SHA256="731a754584aa2f88f93fa7035a9ddca634fcd7a5da24fec48007c63d7487db0c"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/mediacenter/kodi/config/appliance.xml b/packages/mediacenter/kodi/config/appliance.xml
index 14695e54a1..8889ff1410 100644
--- a/packages/mediacenter/kodi/config/appliance.xml
+++ b/packages/mediacenter/kodi/config/appliance.xml
@@ -20,9 +20,6 @@
         <setting id="videoscreen.screen">
           <visible>false</visible>
         </setting>
-        <setting id="videoscreen.limitedrange">
-          <level>1</level>
-        </setting>
       </group>
       <group id="3">
         <setting id="videoscreen.noofbuffers">
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 1167033bd8..06cc75cc83 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -15,14 +15,14 @@ PKG_PATCH_DIRS="$KODI_VENDOR"
 
 case $KODI_VENDOR in
   raspberrypi)
-    PKG_VERSION="tag" #Leia BetaX
-    PKG_SHA256="sha-for-tag"
+    PKG_VERSION="newclock5_18.0b1v2-Leia"
+    PKG_SHA256="7434263c55aa528f3e3d8f455cffe3148e3707a1c1068f80bd08829094e16576"
     PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_DIR="xbmc-$PKG_VERSION*"
     ;;
   *)
-    PKG_VERSION="f08d8686e96edcfbe065d4e5094ab6221da057b9" #Leia Beta 1
-    PKG_SHA256="eec4e71d836894c39cd722eb3a1b73e2ee678aeadb64abcea2d85227d871bb86"
+    PKG_VERSION="18.0b1v2-Leia"
+    PKG_SHA256="3808aa97723b710a0774261116e3387f091bc3d8150b9ba49ef36cb30b3d7ba2"
     PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_DIR="xbmc-$PKG_VERSION*"
     ;;
diff --git a/projects/RPi/options b/projects/RPi/options
index 712e489601..f8ff7615ea 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -120,7 +120,7 @@ fi
     GRAPHIC_DRIVERS=""
 
   # Use a vendor specific KODI repo
-  # KODI_VENDOR="raspberrypi"
+    KODI_VENDOR="raspberrypi"
 
   # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
     KODIPLAYER_DRIVER="bcm2835-driver"