diff --git a/device/testing/device-fairphone-fp4/APKBUILD b/device/testing/device-fairphone-fp4/APKBUILD
index e54097879..6ded5b823 100644
--- a/device/testing/device-fairphone-fp4/APKBUILD
+++ b/device/testing/device-fairphone-fp4/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=0.1
+pkgver=0.2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -15,6 +15,9 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -24,6 +27,25 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Firmware for Modem, WiFi, etc."
+	depends="
+		firmware-fairphone-fp4-adreno
+		firmware-fairphone-fp4-adsp
+		firmware-fairphone-fp4-cdsp
+		firmware-fairphone-fp4-ipa
+		firmware-fairphone-fp4-modem
+		firmware-fairphone-fp4-wlan
+		linux-firmware-ath10k
+		msm-modem
+		msm-modem-uim-selection
+		pd-mapper
+		tqftpserv
+		"
+	install="$subpkgname.post-install"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
-cf7388665c429b7046385b2c810d85b7ed380180d38cdc435915beb3347b2f1679d54388ebf856a812f6839fb431b6c9f7e0d576565f283b941ed26da6543d55  deviceinfo
+f6cbf5a753757cd72df609ff9c45172f5d7f8266d9514275fe3d9f56218abb74ee94bc240c97aa728e2a82f4ccf65b1d6ec608eb0c84d5ba6274e631cf6a019a  deviceinfo
 "
diff --git a/device/testing/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install b/device/testing/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install
new file mode 100644
index 000000000..70b9e0efe
--- /dev/null
+++ b/device/testing/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+rc-update add tqftpserv boot
+rc-update add pd-mapper boot
diff --git a/device/testing/device-fairphone-fp4/deviceinfo b/device/testing/device-fairphone-fp4/deviceinfo
index ea6b4594d..186516152 100644
--- a/device/testing/device-fairphone-fp4/deviceinfo
+++ b/device/testing/device-fairphone-fp4/deviceinfo
@@ -21,7 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT sdhci.debug_quirks=0x40"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"