diff --git a/device/testing/device-samsung-kyle/APKBUILD b/device/testing/device-samsung-kyle/APKBUILD
index a41091398..4b3690e26 100644
--- a/device/testing/device-samsung-kyle/APKBUILD
+++ b/device/testing/device-samsung-kyle/APKBUILD
@@ -2,16 +2,20 @@
 maintainer="Linus Walleij <linusw@kernel.org>"
 pkgname=device-samsung-kyle
 pkgdesc="Samsung Galaxy Amp (SGH-I407)"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg linux-postmarketos-stericsson"
+depends="
+	firmware-samsung-u8500
+	linux-postmarketos-stericsson
+	mkbootimg
+	postmarketos-base
+	"
 makedepends="devicepkg-dev"
 subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-kwin
 	$pkgname-phosh
 "
@@ -30,12 +34,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="WiFi/BT firmware"
-	depends="firmware-samsung-u8500"
-	mkdir "$subpkgdir"
-}
-
 kwin() {
 	install_if="$pkgname kwin"
 	install -Dm644 "$srcdir"/kwin.sh "$subpkgdir"/etc/profile.d/kwin.sh