diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index ce239d5f71..04f2b2d497 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -13,26 +13,26 @@ PKG_PATCH_DIRS="$KODI_VENDOR"
 
 case $KODI_VENDOR in
   raspberrypi)
-    PKG_VERSION="newclock5_18.3-Leia"
-    PKG_SHA256="7e7a89a66a1921b0fa32478277d11361b3c7a04aea88784bac668b300b182298"
+    PKG_VERSION="newclock5_18.4-Leia"
+    PKG_SHA256="2d3c864202a391dfe60b7eeade27a6ce1a9dfac2d0fc80add70cf5bd8318dadf"
     PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
     ;;
   raspberrypi4)
-    PKG_VERSION="b0e4133d0f26c0dd2f305c689c8c6b3ea084d7b1" # 18.3-Leia
-    PKG_SHA256="9e4d2b0cc597ae3b8ad3352e6a2a306b268ccb3974d2cfa52dedff8c3de73982"
+    PKG_VERSION="leia_pi4_18.4-Leia"
+    PKG_SHA256="39c075e40a076c6fb60a6d954573916d671b33caf9ec5f2b6e4549990afa4b34"
     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.3-Leia-v2"
-    PKG_SHA256="dfce13129aa8381a4e06cd6c0f597c6212f4230184723edf802d06ea20d5509b"
+    PKG_VERSION="rockchip_18.4-Leia"
+    PKG_SHA256="16a64493ba1c91f22064444970147b505e6d38d368012f4ea88c68c1416a2ef2"
     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.3-Leia"
-    PKG_SHA256="4f265901c00f582beb8d6ad96c9c303e5ab82611e828c7121ae822b07c0915cc"
+    PKG_VERSION="18.4-Leia"
+    PKG_SHA256="bf2be186d8ae5b5377e43c06a538012bb9f51a0e98f8244b70a401006861d110"
     PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="kodi-$PKG_VERSION.tar.gz"
     ;;
diff --git a/packages/mediacenter/kodi/patches/kodi-995.01-revert-always-update-stream-detail.patch b/packages/mediacenter/kodi/patches/kodi-995.01-revert-always-update-stream-detail.patch
deleted file mode 100644
index 0795b2e213..0000000000
--- a/packages/mediacenter/kodi/patches/kodi-995.01-revert-always-update-stream-detail.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 545ca6a2e8b3af40fba3e9786c7b7b677eb712d3
-Author: afl1 <afl2001@gmail.com>
-Date:   Tue May 14 23:37:59 2019 +0200
-
-    Revert "fixed: We should always update stream details from player (fixes #15584)"
-    
-    This reverts commit be1ed70fb4b926cbdaf60367172ac7902690f00f.
-
-diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
-index 1c4f5dfcd0..4b1550d1b9 100644
---- a/xbmc/Application.cpp
-+++ b/xbmc/Application.cpp
-@@ -3049,8 +3049,9 @@ void CApplication::OnPlayBackStarted(const CFileItem &file)
- {
-   CLog::LogF(LOGDEBUG,"CApplication::OnPlayBackStarted");
- 
--  // Always update file item stream details
--  m_appPlayer.SetUpdateStreamDetails();
-+  // check if VideoPlayer should set file item stream details from its current streams
-+  if (file.GetProperty("get_stream_details_from_player").asBoolean())
-+    m_appPlayer.SetUpdateStreamDetails();
- 
-   if (m_stackHelper.IsPlayingISOStack() || m_stackHelper.IsPlayingRegularStack())
-     m_itemCurrentFile.reset(new CFileItem(*m_stackHelper.GetRegisteredStack(file)));