diff --git a/srcpkgs/kodi-rpi/files/CMakeCache.txt.nojava b/srcpkgs/kodi-rpi/files/CMakeCache.txt.nojava
deleted file mode 120000
index 6d60129ddc2..00000000000
--- a/srcpkgs/kodi-rpi/files/CMakeCache.txt.nojava
+++ /dev/null
@@ -1 +0,0 @@
-../../kodi/files/CMakeCache.txt.nojava
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/files/swig.nojava-18.4 b/srcpkgs/kodi-rpi/files/swig.nojava-18.4
deleted file mode 120000
index 849e63c3370..00000000000
--- a/srcpkgs/kodi-rpi/files/swig.nojava-18.4
+++ /dev/null
@@ -1 +0,0 @@
-../../kodi/files/swig.nojava-18.4
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index af74685dfcb..e873dc3c1f6 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
-version=18.4
-revision=3
+version=18.5
+revision=1
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://www.kodi.tv/"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=bf2be186d8ae5b5377e43c06a538012bb9f51a0e98f8244b70a401006861d110
+checksum=108979df8b41ab4168f5cdc0233f46e38767eda5921f4ccae16584e98d0d6b29
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 patch_args="-Np1"
 
@@ -20,7 +20,7 @@ archs="armv6l* armv7l*"
 hostmakedepends="
  automake libtool pkg-config gperf cmake zip unzip nasm yasm
  gettext-devel libltdl-devel python-devel libmysqlclient-devel
- SDL2_image-devel lzo-devel flatbuffers"
+ SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
 makedepends="
  libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
  libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
@@ -75,15 +75,7 @@ pre_configure() {
 		grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
 		xargs sed -i  -e "s;-isystem;-I;g"
 
-	# Copy generated files to avoid requiring java.
-	mkdir -p build/build/swig
-
-	# THESE FILES MUST BE UPDATED WITH EVERY VERSION BUMP!
-	# (See kodi template)
-	cp -r $FILESDIR/swig.nojava-$version/* -t build/build/swig
-	cp $FILESDIR/CMakeCache.txt.nojava build/CMakeCache.txt
-
-	echo "set(FOUND_SWIG Yes)" > cmake/modules/FindSWIG.cmake
+	. /etc/profile.d/10_openjdk11.sh
 
 	if [ "$CROSS_BUILD" ]; then
 		for i in JsonSchemaBuilder TexturePacker; do