diff --git a/device/device-fairphone-fp2/APKBUILD b/device/device-fairphone-fp2/APKBUILD
index d85873b3c..3c89a7f9b 100644
--- a/device/device-fairphone-fp2/APKBUILD
+++ b/device/device-fairphone-fp2/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=device-fairphone-fp2
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Fairphone 2"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
-depends="postmarketos-base linux-fairphone-fp2 linux-firmware mkbootimg mesa-dri-swrast"
+depends="postmarketos-base linux-fairphone-fp2 mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
-subpackages=""
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	90-android-touch-dev.rules
@@ -25,6 +25,12 @@ package() {
 		"$pkgdir"/etc/wifi/bcmdhd.cal
 }
 
+nonfree_firmware() {
+	depends="firmware-fairphone-fp2"
+	pkgdesc="WCNSS firmware (WiFi, Bluetooth, FM)"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="44fd0b53e82db37d111a04641ca2ebd132d154a40fd5a3e8591e7679688932b12ebbb1e758563eaa850871ced3b6454ba66af92ef822c1e02ba117b765808f3d  deviceinfo
 4e6c0b87872f278de5603d821a1e9dab8363db285d1d7fd56e900b33e8533eecb79b1fb6359e58e112e69e714a4f2aee06157b1d6f8d3e26274cd29c93cd659b  90-android-touch-dev.rules
 32652ef366694f34dec31f316a38aca96700e3a5a3eac1f8d192e3c5de7b91e480b1c0fcd8e7c80a51692dc3737020ebbb2e5d3779436e82fb18822089c63055  bcmdhd.cal"