diff --git a/alarm/kodi-rbp4/PKGBUILD b/alarm/kodi-rbp4/PKGBUILD
index c12a88a43..7e48a7e01 100644
--- a/alarm/kodi-rbp4/PKGBUILD
+++ b/alarm/kodi-rbp4/PKGBUILD
@@ -25,11 +25,11 @@ _prefix=/usr
 
 pkgbase=kodi-rbp4
 pkgname=('kodi-rbp4' 'kodi-rbp4-eventclients' 'kodi-rbp4-tools-texturepacker' 'kodi-rbp4-dev')
-pkgver=18.3
-pkgrel=3
+pkgver=18.4
+pkgrel=1
 _codename=Leia
-_tag="18.3-$_codename"
-_ffmpeg_version="4.0.3-$_codename-18.2"
+_tag="18.4-$_codename"
+_ffmpeg_version="4.0.4-$_codename-18.4"
 _libdvdcss_version="1.4.2-$_codename-Beta-5"
 _libdvdnav_version="6.0.0-$_codename-Alpha-3"
 _libdvdread_version="6.0.0-$_codename-Alpha-3"
@@ -55,10 +55,10 @@ makedepends=(
 # leia_rpi4 branch contains patches to enable hardware decoding on rpi4
 # expect kodi v19 to not to use MMAL but to use ffmpeg+v4l2
 # https://github.com/popcornmix/xbmc/commits/leia_pi4
-_commit=b0e4133d0f26c0dd2f305c689c8c6b3ea084d7b1
+_commit=3487ce18e30be7eaf9aab4fba0ec91d08060a305
 
 source=(
-  "xbmc-18.3-Leia.zip::https://github.com/popcornmix/xbmc/archive/$_commit.zip"
+  "xbmc-$pkgver-$_codename.zip::https://github.com/popcornmix/xbmc/archive/$_commit.zip"
   'kodi.service'
   '99-kodi.rules'
   'polkit.rules'
@@ -83,12 +83,12 @@ noextract=(
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
 )
-sha256sums=('38b4b3d431fe76670bf74d8fea659c7244a5ddd927a4d703250e347a924eb798'
+sha256sums=('effff0f1f8170fd0c5dbbe665c10c7e65cd8bd422f888a2f7fb2004b5e3cee19'
             '585796d8a7f1ece32c24ff67b38885f0e3397372a4b9879eee3160a59391e333'
             '8e14cf455898246d11edd4ff7f4ed11a44c729fb40c34455a5b336a90ccc1f7b'
             '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96'
             '849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb'
-            '68535cc2a000946b62ce4be6edf7dda7900bd524f22bcb826800b94f4a873314'
+            'e11e7594af35f36ab2711252c3d6bb106908f26605498aef4a9be2d7bc001db2'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
@@ -138,8 +138,8 @@ build() {
 
   # building for RPi4
   unset CFLAGS CXXFLAGS
-  CFLAGS=" -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a72 -mfloat-abi=hard -O2 -pipe -fstack-protector-strong -fno-plt"
-  CXXFLAGS="${CFLAGS}"
+  export CFLAGS="-march=armv8-a+crc+simd -mtune=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard -O2 -pipe -fstack-protector-strong -fno-plt"
+  export CXXFLAGS="${CFLAGS}"
 
   # exporting PKG_CONFIG_PATH and building with the extra lib definitions
   # are part of the workaround discussed above