diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk
index 2a1979a4ef..7ee1852153 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="0aa60700b396b9e19e5fe35c27a4c62b4706d188"
-PKG_SHA256="f6183f0c6ad12ce1a7c1058de0d5d6da527b504e3be15f6df05bffb95065ecc8"
+PKG_VERSION="47518847b7b8c12f037b8c0c1b74979227fbd270"
+PKG_SHA256="243a873181b4bb2e4241f72d6fe5a1525512b9b313796bdec24919f7cae7e5a4"
 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 dd954b51d8..e7142f8e0d 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="b6a5202214833a95db6c7f35db65a6a49f0cabaf"
-PKG_SHA256="5b7a3b2e0d73446c257019b63feeebbf58d1e2cccb7c9605c0d909a946674494"
+PKG_VERSION="a7f101b7274948f4aea307fee2b30b18a7dce473"
+PKG_SHA256="3bb9289cb5bf2781164c65d776ee1c2cb46997a506864ac6bc1f87b38bb55fc3"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk
index 7aeaf2374b..ac393ac456 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.mythtv"
-PKG_VERSION="322f47d58b54df7f1220512a47ffcc14ab92c37d"
-PKG_SHA256="ac8bb6e9ef04ef56425fbe8b914a5b14b53966d3569ab8b830bb103470a39ffb"
+PKG_VERSION="5272219abed36996bcf64227236ff7315a97bd58"
+PKG_SHA256="90632be51e2e1911ef8ab8f34c77c76d67747bbc2b66524132dd955a035de979"
 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 5086fedc89..40b218e0a8 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="42a9a4b8ee9c0cfb94ad0d68dc23f816c4b8ec18"
-PKG_SHA256="caa7203a1e6d986d1526692594c582346852f615d70e12badd64946dbacc933b"
+PKG_VERSION="4d6df2f6b9e46767f93d40ed29ad17b39c3fc3d0"
+PKG_SHA256="5b386fcc8eb6498e3f1d4c61f3af3df3a36cdb8c38454fdd5b56414a6cea52a3"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk
index 0d4f323a54..dfe7ec1467 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="2245b0d7085c5a34b3e88fb982e7bd731d59608a"
-PKG_SHA256="1a7679ffaa8a2901b5a57632f7c0595173d6f1c0ae890a52daab51f55c0aba45"
+PKG_VERSION="d0170c5b3fc496d8a51fe894661babcd5d7b4347"
+PKG_SHA256="d82468c43b01f54084827f9e4298bbb641fff12442bff6d9eb0f4381f3afc721"
 PKG_REV="2"
 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 553c85f390..c2be84c359 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="6ed2f63f29feb22ba3ce28350ca339503c56d1b2"
-PKG_SHA256="77032d3e3f8ce70cb7690852053b4ee58dad20a2434d463f704c4ec98cecf398"
+PKG_VERSION="ea20464ea7ea36b4c6163c8d74e589604023d01d"
+PKG_SHA256="a463278c1c8a84268cc902e802fc8f572319bdcffba3335ec93987bbf2fc49ad"
 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 3b53215349..eba1736ab0 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
@@ -3,14 +3,14 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.vuplus"
-PKG_VERSION="ec29899c002373c1220c90728b0f1bd40280f48f"
-PKG_SHA256="9b956742f24605ca535cca4341734b5a9a39abd58b119f6e1ed454ce5a49de47"
+PKG_VERSION="fb822e940aadfa69e8e5d116ea3dd01a6470a5f5"
+PKG_SHA256="a02164e81449d30c3ed507419b10238d63a6b9eb82462351561fcd115d917fb1"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/kodi-pvr/pvr.vuplus/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain kodi-platform"
+PKG_DEPENDS_TARGET="toolchain kodi-platform nlohmann-json"
 PKG_SECTION=""
 PKG_SHORTDESC="pvr.vuplus"
 PKG_LONGDESC="pvr.vuplus"
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index a02ea76cb4..be16ffd748 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -12,20 +12,20 @@ PKG_PATCH_DIRS="$KODI_VENDOR"
 
 case $KODI_VENDOR in
   raspberrypi)
-    PKG_VERSION="newclock5_18.0rc4-Leia"
-    PKG_SHA256="d4151ff73ab7790764100bf1b47908419bed9b04e1eb00f2e0480f95827b50b2"
+    PKG_VERSION="newclock5_18.0rc5.2-Leia"
+    PKG_SHA256="af37f2bdb84a97e4fb1eac3a2b0bd699d77355319c00f7bd7c785eb089f852ae"
     PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
     ;;
   rockchip)
-    PKG_VERSION="rockchip_18.0rc4-Leia"
-    PKG_SHA256="1c5ee8235319e957f5c7e2c5d601ee6816e7a710318fbd047201f02e9f0acbc6"
+    PKG_VERSION="rockchip_18.0rc5.2-Leia"
+    PKG_SHA256="9030f186b87de40ee922b7b791e7bcc21cc408b9232bf7a83315ec0c2dffb185"
     PKG_URL="https://github.com/kwiboo/xbmc/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
     ;;
   *)
-    PKG_VERSION="18.0rc4-Leia"
-    PKG_SHA256="90f7a8c32e571654d2503a4e97e438b597ff19ae7876e926aaa06b8de516b72b"
+    PKG_VERSION="18.0rc5.2-Leia"
+    PKG_SHA256="e8ec83659339491286bf7d9f65037f18c0a4e21d5479808474ef5ca98ff691bb"
     PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="kodi-$PKG_VERSION.tar.gz"
     ;;
diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
index 246b3966f4..47011ae85f 100644
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -4,8 +4,8 @@
 
 PKG_NAME="ffmpeg"
 # Current branch is: release/4.0-kodi
-PKG_VERSION="4.0.3-Leia-Beta5"
-PKG_SHA256="f25559d4b803321483b28ac9b513671200bdc8e3531c02f0affdd622846a9c5e"
+PKG_VERSION="4.0.3-Leia-RC5"
+PKG_SHA256="9a971662e44353c120f2ccf87655571998956e699a2dd800ec708b8b928a53c8"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
 PKG_URL="https://github.com/xbmc/FFmpeg/archive/${PKG_VERSION}.tar.gz"
diff --git a/packages/network/libnfs/package.mk b/packages/network/libnfs/package.mk
index 461c53db92..a708e2c32a 100644
--- a/packages/network/libnfs/package.mk
+++ b/packages/network/libnfs/package.mk
@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libnfs"
-PKG_VERSION="3.0.0"
-PKG_SHA256="445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5"
+PKG_VERSION="38b62bcf873c778ebde79707bb0409b6a09ee608"
+PKG_SHA256="12e8e2e142ca4c41e1f1a22ce6e88b205bacdedfa29daaff91a5d54cf834ea61"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/sahlberg/libnfs"
-PKG_URL="https://github.com/sahlberg/libnfs/archive/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/sahlberg/libnfs/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A client library for accessing NFS shares over a network."
 PKG_TOOLCHAIN="autotools"
diff --git a/packages/textproc/nlohmann-json/package.mk b/packages/textproc/nlohmann-json/package.mk
new file mode 100644
index 0000000000..66d76a7fda
--- /dev/null
+++ b/packages/textproc/nlohmann-json/package.mk
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="nlohmann-json"
+PKG_VERSION="3.5.0"
+PKG_SHA256="e0b1fc6cc6ca05706cce99118a87aca5248bd9db3113e703023d23f044995c1d"
+PKG_LICENSE="MIT"
+PKG_SITE="https://nlohmann.github.io/json/"
+PKG_URL="https://github.com/nlohmann/json/archive/v$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="JSON for Modern C++"
+PKG_TOOLCHAIN="cmake"
+
+PKG_CMAKE_OPTS_TARGET="-DBUILD_TESTING:BOOL=OFF"