diff --git a/aports/linux-samsung-i9070/APKBUILD b/aports/linux-samsung-i9070/APKBUILD
index 9d655809..21edff5e 100644
--- a/aports/linux-samsung-i9070/APKBUILD
+++ b/aports/linux-samsung-i9070/APKBUILD
@@ -13,10 +13,6 @@
 # Kernel config changes, based on: arch/arm/configs/janice_defconfig
 # - enable devtmpfs (needed for udev -> touch support in weston)
 
-# This must be built in the target chroot, so busybox.static can
-# be used.
-_pmb_build_in_native_chroot="false"
-
 _vendor=samsung
 _flavor=samsung-i9070
 _hash="ac7219c4b8dcec7bc5a598d42c6be0db4aa36332"
@@ -28,13 +24,13 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=1
+pkgrel=2
 arch="armhf"
 pkgdesc="Samsung Galaxy S Advance kernel from Epirex"
 url="https://github.com/Epirex/Samsung_STE_Kernel"
 depends="postmarketos-mkinitfs"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev
-findutils busybox-static"
+findutils busybox-static-armhf"
 options="!strip !check !tracedeps"
 install=
 source="
@@ -79,7 +75,8 @@ prepare() {
 
 	# Use Alpine's busybox.static instead of the pre-compiled busybox shipped
 	# with the source
-	cp -v /bin/busybox.static "$ksrcdir"/usr/u8500_initramfs_files/busybox
+	cp -v /usr/$(arch_to_hostspec $arch)/bin/busybox.static \
+		"$ksrcdir"/usr/u8500_initramfs_files/busybox
 
 	# do not use ramdisk.cpio and ramdisk-recovery.cpio, always use
 	# the initramfs from the kernel2 partition ("isorec"), so we can build
diff --git a/aports/linux-samsung-i9100/APKBUILD b/aports/linux-samsung-i9100/APKBUILD
index 5e3f02ff..7de1bac1 100644
--- a/aports/linux-samsung-i9100/APKBUILD
+++ b/aports/linux-samsung-i9100/APKBUILD
@@ -13,10 +13,6 @@
 # - change compression from CONFIG_KERNEL_LZMA=y to
 #	CONFIG_KERNEL_GZIP=y (so it works with busybox)
 
-# This must be built in the target chroot, so busybox.static can
-# be used.
-_pmb_build_in_native_chroot="false"
-
 _vendor=samsung
 _flavor=samsung-i9100
 _hash="349a3e91e76d17e67ef6213e1f6712e700695631"
@@ -28,13 +24,13 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=5
+pkgrel=6
 arch="armhf"
 pkgdesc="Samsung Galaxy SII kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_samsung_smdk4412"
 depends="postmarketos-mkinitfs"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev
-findutils busybox-static"
+findutils busybox-static-armhf"
 options="!strip !check !tracedeps"
 install=
 source="
@@ -78,7 +74,8 @@ prepare() {
 
 	# Use Alpine's busybox.static instead of the pre-compiled busybox shipped
 	# with the source
-	cp -v /bin/busybox.static "$ksrcdir"/usr/galaxys2_initramfs_files/busybox
+	cp -v /usr/$(arch_to_hostspec $arch)/bin/busybox.static \
+		"$ksrcdir"/usr/galaxys2_initramfs_files/busybox
 
 	# do not use ramdisk.cpio and ramdisk-recovery-device.cpio, always use
 	# the initramfs from the recovery partition ("isorec"), so we can build
diff --git a/pmb/build/autodetect.py b/pmb/build/autodetect.py
index 2d227f37..89fc8c98 100644
--- a/pmb/build/autodetect.py
+++ b/pmb/build/autodetect.py
@@ -47,7 +47,7 @@ def suffix(args, apkbuild, carch):
     pkgname = apkbuild["pkgname"]
     if pkgname.endswith("-repack"):
         return "native"
-    if args.cross and apkbuild["_pmb_build_in_native_chroot"] != "false":
+    if args.cross:
         for pattern in pmb.config.build_cross_native:
             if fnmatch.fnmatch(pkgname, pattern):
                 return "native"
diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py
index 05a721e2..76f59e02 100644
--- a/pmb/config/__init__.py
+++ b/pmb/config/__init__.py
@@ -143,7 +143,6 @@ apkbuild_attributes = {
     "_flavor": {"array": False},
     "_device": {"array": False},
     "_kernver": {"array": False},
-    "_pmb_build_in_native_chroot": {"array": False},
 
     # mesa
     "_llvmver": {"array": False},