diff --git a/alarm/kodi-rpi-git/PKGBUILD b/alarm/kodi-rpi-git/PKGBUILD
index 013e6b2fb..50920474e 100644
--- a/alarm/kodi-rpi-git/PKGBUILD
+++ b/alarm/kodi-rpi-git/PKGBUILD
@@ -17,7 +17,7 @@ _commitnumber=56808
 _commit=0f75c910145f31dcb48219bc6174b0a15156ceaa
 
 pkgver="19.0b2.$_commitnumber.${_commit:0:10}"
-pkgrel=2
+pkgrel=3
 arch=('armv7h')
 url="http://kodi.tv"
 license=('GPL2')
@@ -151,7 +151,7 @@ build() {
 }
 
 package_kodi-rpi-git() {
-  pkgdesc="A software media player and entertainment hub for digital media (Raspberry Pi4/gbm only)"
+  pkgdesc="Media player and entertainment hub for Raspberry Pi 4, gbm fork"
   depends=(
     'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python-pycryptodomex'
     'python-pillow' 'python-simplejson' 'xorg-xdpyinfo'
@@ -167,8 +167,8 @@ package_kodi-rpi-git() {
     'lsb-release: log distro information in crashlog'
   )
   install='kodi.install'
-  provides=('xbmc' 'kodi')
-  conflicts=('xbmc' 'kodi' 'arm-mem-git' 'shairplay-git' 'kodi-rbp4-git' 'kodi-rpi')
+  provides=('xbmc' "kodi=${pkgver}")
+  conflicts=('xbmc' 'kodi' 'arm-mem-git' 'shairplay-git' 'kodi-rbp4-git' 'kodi-rpi' 'kodi-rpi-legacy')
   replaces=('xbmc-rbp-git' 'kodi-rbp4-git')
   _components=('kodi' 'kodi-bin')
 
@@ -205,10 +205,10 @@ package_kodi-rpi-git() {
 }
 
 package_kodi-rpi-git-eventclients() {
-  pkgdesc="Kodi Event Clients (master branch)"
-  provides=('kodi-eventclients')
+  pkgdesc="Kodi Event Clients for Raspberry Pi 4, gbm fork"
+  provides=("kodi-eventclients=${pkgver}")
   replaces=('kodi-eventclients-rbp4-git')
-  conflicts=('kodi-eventclients' 'kodi-eventclients-rbp4-git' 'kodi-rpi-eventclients')
+  conflicts=('kodi-eventclients' 'kodi-eventclients-rbp4-git' 'kodi-rpi-eventclients' 'kodi-rpi-legacy-eventclients')
   optdepends=('python: most eventclients are implemented in python')
 
   _components=(
@@ -228,10 +228,10 @@ package_kodi-rpi-git-eventclients() {
 }
 
 package_kodi-rpi-git-tools-texturepacker() {
-  pkgdesc="Kodi Texturepacker tool (master branch)"
+  pkgdesc="Kodi Texturepacker Tool for Raspberry Pi 4, gbm fork"
   depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
   replaces=('kodi-tools-texturepacker-rbp4-git')
-  conflicts=('kodi-eventclients' 'kodi-tools-texturepacker-rbp4-git' 'kodi-rpi-texturepacker')
+  conflicts=('kodi-tools-texturepacker' 'kodi-tools-texturepacker-rbp4-git' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-legacy-tools-texturepacker')
   _components=('kodi-tools-texturepacker')
 
   export PATH="$srcdir/path:$PATH"
@@ -245,11 +245,11 @@ package_kodi-rpi-git-tools-texturepacker() {
 }
 
 package_kodi-rpi-git-dev() {
-  pkgdesc="Kodi dev files (master branch)"
+  pkgdesc="Kodi dev files for Raspberry Pi 4, gbm fork"
   depends=('kodi')
   replaces=('kodi-dev-rbp4-git')
-  conflicts=('kodi-dev-rbp4-git' 'kodi-rpi-dev')
-  provides=('kodi-dev')
+  conflicts=('kodi-dev-rbp4-git' 'kodi-rpi-dev' 'kodi-rpi-legacy-dev')
+  provides=("kodi-dev=${pkgver}")
 
   _components=('kodi-addon-dev'
     'kodi-audio-dev'