diff --git a/alarm/kodi-rpi/PKGBUILD b/alarm/kodi-rpi/PKGBUILD
index be5cdfc50..910ddbaa7 100644
--- a/alarm/kodi-rpi/PKGBUILD
+++ b/alarm/kodi-rpi/PKGBUILD
@@ -13,7 +13,7 @@ _prefix=/usr
 pkgbase=kodi-rpi
 pkgname=('kodi-rpi' 'kodi-rpi-eventclients' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-dev')
 pkgver=19.0
-pkgrel=3
+pkgrel=4
 arch=('armv7h' 'aarch64')
 url="https://github.com/popcornmix/xbmc/tree/gbm"
 license=('GPL2')
@@ -49,9 +49,9 @@ _crossguid_version="8f399e8bd4"
 _fstrcmp_version="0.7.D001"
 _flatbuffers_version="1.11.0"
 _spdlog_version="1.5.0"
+_name="gbm_matrix-$pkgver-$_codename"
 source=(
-  #"xbmc-$pkgver.tar.gz::https://github.com/popcornmix/xbmc/archive/gbm_$pkgver-$_codename.tar.gz"
-  "xbmc-$pkgver.tar.gz::https://github.com/graysky2/xbmc/archive/gbm_$pkgver-$_codename.tar.gz"
+  "xbmc-$pkgver.tar.gz::https://github.com/graysky2/xbmc/archive/$_name.tar.gz"
   kodi.service
   99-kodi.rules
   polkit.rules
@@ -82,7 +82,7 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "spdlog-$_spdlog_version.tar.gz"
 )
-sha256sums=('de247fbeed3bcee34bb776ff4fb65613e77fd886ddaceb47e6f9cc44da02590d'
+sha256sums=('92adf716d9d42b9b8cb86b997fb7a98a95fbb782f2db218cba54c4cd3c759527'
             'bb8f0c0fd03ff7c13c0503f2c96f86772d8bbd05adbc97d5b383f603a98456c0'
             '61a0648d4a5086f560ceb4e020f82472d00b99398f2cacba94fad3e96c4c362a'
             '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f'
@@ -101,7 +101,7 @@ sha256sums=('de247fbeed3bcee34bb776ff4fb65613e77fd886ddaceb47e6f9cc44da02590d'
             '16d6c79ff3a3d3653f21d77a36326a0335c8cec49a9c06dbc2de0ed143e50a9f'
             '76eafede11af936bb554932b2be71ce91d4bf1c07107d847500ebbf3ff7d7245')
 prepare() {
-  cd xbmc-gbm_19.0-Matrix
+  cd "xbmc-$_name"
 
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir "$srcdir"/kodi-build
@@ -171,7 +171,7 @@ build() {
     -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz"
   )
 
-  cmake "${_args[@]}" ../xbmc-gbm_19.0-Matrix
+  cmake "${_args[@]}" ../"xbmc-$_name"
   make
   make preinstall
 }