diff --git a/alarm/kodi-rbp/PKGBUILD b/alarm/kodi-rbp/PKGBUILD
index 84c8bca5a..bd5c7d405 100644
--- a/alarm/kodi-rbp/PKGBUILD
+++ b/alarm/kodi-rbp/PKGBUILD
@@ -12,7 +12,7 @@ _prefix=/usr
 pkgbase=kodi-rbp
 pkgname=('kodi-rbp' 'kodi-rbp-eventclients' 'kodi-rbp-tools-texturepacker' 'kodi-rbp-dev')
 pkgver=18.8
-pkgrel=1
+pkgrel=2
 _codename=Leia
 _tag="$pkgver-$_codename"
 _ffmpeg_version="4.0.4-$_codename-18.4"
@@ -63,7 +63,7 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
 )
 sha256sums=('a8ee10ee98de24feb32c22ef0fb7b4ff5ba762b0bf2694a797fe2322d4cc000e'
-            '8f8e6a2552d8f897f10ee8eb60939a34c8502d294037393e854d0708b1a5c28c'
+            '75e49edccf6d124c49f6c47a10c1da6dfdc406bbbc1931d1031ee3b34b737ea1'
             'fe7a1ab2a6e2bf00f756c76545a338d2763003052764d722d492b06b1bc05f5e'
             'b31570f95654434b01fd8531612fbb6be77cbc1c519dd60f92feae26eb160f3d'
             '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f'
diff --git a/alarm/kodi-rbp/kodi.service b/alarm/kodi-rbp/kodi.service
index db96e8353..2457f7356 100644
--- a/alarm/kodi-rbp/kodi.service
+++ b/alarm/kodi-rbp/kodi.service
@@ -1,18 +1,23 @@
 [Unit]
 Description=Kodi standalone
-After=remote-fs.target
+After=remote-fs.target systemd-user-sessions.service network-online.target nss-lookup.target sound.target bluetooth.target polkit.service upower.service mysqld.service
+Wants=network-online.target polkit.service upower.service
+Conflicts=getty@tty1.service
 
 [Service]
 User=kodi
 Group=kodi
+AMName=login
+TTYPath=/dev/tty1
+EnvironmentFile=/etc/conf.d/kodi-framebuffer
 ExecStartPre=+/bin/sh -c 'echo 0 > /sys/class/vtconsole/vtcon1/bind'
 ExecStartPre=+/usr/bin/fbset -g 4 2 4 2 32
-ExecStart=/usr/bin/kodi-standalone
+ExecStart=/usr/lib/kodi/kodi-rbpi --standalone
 ExecStopPost=+/usr/bin/fbset -g $RESTOREMODE
 ExecStopPost=+/bin/sh -c 'echo 1 > /sys/class/vtconsole/vtcon1/bind'
-Restart=on-failure
-SendSIGHUP=yes
-EnvironmentFile=/etc/conf.d/kodi-framebuffer
+Restart=on-abort
+StandardInput=tty
+StandardOutput=journal
 
 [Install]
 Alias=display-manager.service