diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index c78f724e6a..1fede4972f 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -12,12 +12,13 @@ license="GPL-2"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
 checksum=dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110
 
+nopie=yes
 only_for_archs="armv6l armv6l-musl armv7l armv7l-musl"
 
 hostmakedepends="
  automake libtool pkg-config gperf cmake zip unzip nasm yasm
  gettext-devel libltdl-devel python-devel libmysqlclient-devel
- SDL2_image-devel lzo-devel"
+ SDL2_image-devel lzo-devel swig"
 makedepends="
  libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
  avahi-libs-devel alsa-lib-devel samba-devel tiff-devel libmysqlclient-devel
@@ -36,7 +37,7 @@ depends+=" hicolor-icon-theme desktop-file-utils"
 # musl builds need generated addons (no java).
 case "$XBPS_MACHINE" in
 	*-musl) _kodi_nojava=yes;;
-	*) hostmakedepends+=" swig openjdk-jre";;
+	*) hostmakedepends+=" openjdk-jre";;
 esac
 
 provides="kodi-${version}_${revision}"
@@ -51,7 +52,7 @@ pre_configure() {
 	if [ -n "${_kodi_nojava}" ]; then
 		$XBPS_FETCH_CMD http://repo.voidlinux.eu/distfiles/kodi-${version}-generated-addons.tar.xz
 		tar xf kodi-${version}-generated-addons.tar.xz -C ${wrksrc}
-		BOOTSTRAP_STANDALONE=1 make JAVA=/bin/true SWIG=/bin/true -f codegenerator.mk
+		BOOTSTRAP_STANDALONE=1 make JAVA=/bin/true -f codegenerator.mk
 	else
 		. /etc/profile.d/10_openjdk.sh
 		BOOTSTRAP_STANDALONE=1 make -f codegenerator.mk
@@ -94,8 +95,7 @@ do_configure() {
 		--enable-player=omxplayer \
 		--enable-external-libraries \
 		--with-ffmpeg=shared \
-		ac_cv_path_JAVA_EXE=/bin/true \
-		ac_cv_path_SWIG_EXE=/bin/true
+		ac_cv_path_JAVA_EXE=/bin/true
 
 
 	sed -e "s,\$(DVDREAD_CFLAGS),,g;s,AR=ar,AR=$AR,g;s,LD=ld,LD=$LD,g;s,RANLIB=ranlib,RANLIB=$RANLIB,g" -i lib/libdvd/libdvd{nav,read}/Makefile