diff --git a/alarm/kodi-rbp-git/PKGBUILD b/alarm/kodi-rbp-git/PKGBUILD
index 8278a6074..baada9762 100644
--- a/alarm/kodi-rbp-git/PKGBUILD
+++ b/alarm/kodi-rbp-git/PKGBUILD
@@ -12,10 +12,12 @@ _prefix=/usr
 pkgbase=kodi-rbp-git
 _suffix=rbp-git
 pkgname=("kodi-$_suffix" "kodi-eventclients-$_suffix" "kodi-tools-texturepacker-$_suffix" "kodi-dev-$_suffix")
-pkgver=18.0b1.20180818
+pkgver=18.0b1v2.20180827
 pkgrel=1
+_commit=f21b477993cae9f59f77b8798a1390159863f3f7
+_short=${_commit::+7}
 _codename=Leia
-_tag="18.0b1-$_codename"
+_tag="18.0b1v2-$_codename"
 _rtype=Alpha
 _ffmpeg_version="4.0.2-$_codename-$_rtype"3
 _libdvdcss_version="1.4.1-$_codename-$_rtype"-3
@@ -38,7 +40,7 @@ makedepends=(
   'shairplay' 'smbclient' 'speex' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower'
   'yajl' 'zip' 'giflib' 'rapidjson' 'polkit' 'libinput' 'libxkbcommon' 'ghostscript'
 )
-source=("xbmc-$_tag.tar.gz::https://github.com/xbmc/xbmc/archive/$_tag.tar.gz"
+source=("xbmc-$_tag.tar.gz::https://api.github.com/repos/xbmc/xbmc/tarball/$_commit"
   'kodi.service'
   '99-kodi.rules'
   'polkit.rules'
@@ -60,8 +62,9 @@ noextract=(
   "fmt-$_fmt_version.tar.gz"
   "crossguid-$_crossguid_version.tar.gz"
   "fstrcmp-$_fstrcmp_version.tar.gz"
+  "flatbuffers-$_flatbuffers_version.tar.gz"
 )
-sha256sums=('2619243e5d97981d2ceac487e8ea65d9eca24b1dfe430ef0e2c291a3c9a9a20f'
+sha256sums=('be2ccdfd2e9d360893a81ca49580d786d78219e764ddb6d65865eb10806c6f38'
             'aa96b6abb18329dcca7b5f775df69eee10beeb9ca727e867e7a96886953c66d0'
             'b31570f95654434b01fd8531612fbb6be77cbc1c519dd60f92feae26eb160f3d'
             '9ea592205023ba861603d74b63cdb73126c56372a366dc4cb7beb379073cbb96'
@@ -76,7 +79,7 @@ sha256sums=('2619243e5d97981d2ceac487e8ea65d9eca24b1dfe430ef0e2c291a3c9a9a20f'
             '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3')
 
 prepare() {
-  cd "$srcdir/xbmc-$_tag"
+  cd "xbmc-xbmc-$_short"
 
   patch -Np1 -i "$srcdir/hifiberry_digi.patch"
   [[ -d kodi-build ]] && rm -rf kodi-build
@@ -108,7 +111,6 @@ build() {
     -DWITH_CPU="$_CPU" \
     -DENABLE_EVENTCLIENTS=ON \
     -DENABLE_OPENGL=OFF \
-    -DENABLE_X11=OFF \
     -DENABLE_VAAPI=OFF \
     -DENABLE_VDPAU=OFF \
     -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \
@@ -123,7 +125,7 @@ build() {
     -DENABLE_INTERNAL_FSTRCMP=ON \
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \
     -DENABLE_INTERNAL_FLATBUFFERS=ON \
-    ../"xbmc-$_tag"
+    ../"xbmc-xbmc-$_short"
   make
   make preinstall
 }