diff --git a/device/testing/device-samsung-j5x/APKBUILD b/device/testing/device-samsung-j5x/APKBUILD
index cd9dff8c6..f4d7424a2 100644
--- a/device/testing/device-samsung-j5x/APKBUILD
+++ b/device/testing/device-samsung-j5x/APKBUILD
@@ -1,15 +1,23 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-j5x
 pkgdesc="Samsung Galaxy J5 (2016)"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 soc-qcom-msm8916"
+depends="
+	linux-postmarketos-qcom-msm8916
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8916
+	soc-qcom-msm8916-rproc
+"
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+_pmb_select="soc-qcom-msm8916-rproc"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -19,6 +27,12 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
+	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-j5x-wcnss-nv"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 ff3a82a37dfbcc31493d5f72cc00a1ee870cda4ea325fce5d10fa74b85d946fb00f2a85d99c7a301f21128e99c23c520e22b33511241a316af1bbaa21b28295b  deviceinfo
 "
diff --git a/device/testing/firmware-samsung-j5x/APKBUILD b/device/testing/firmware-samsung-j5x/APKBUILD
new file mode 100644
index 000000000..3ccbeb364
--- /dev/null
+++ b/device/testing/firmware-samsung-j5x/APKBUILD
@@ -0,0 +1,32 @@
+pkgname=firmware-samsung-j5x
+pkgver=1
+pkgrel=0
+_name="Samsung Galaxy J5 (2016)"
+pkgdesc="Firmware for $_name"
+url="https://postmarketos.org"
+subpackages="$pkgname-wcnss-nv:wcnss_nv"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/pL9nwXmg"
+
+_fwdir="/lib/firmware/postmarketos"
+
+unpack() {
+	default_unpack
+	base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin
+}
+
+package() {
+	# parent package is empty
+	mkdir -p "$pkgdir"
+}
+
+wcnss_nv() {
+	pkgdesc="$_name WiFi/BT firmware configuration"
+	install -Dm644 "$srcdir"/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir"/wlan/prima
+}
+
+sha512sums="
+09bcbff3e118e307052114c63e1234db1d03c1f09dd56f037159d8f45ae0cccd5a3e18ff1e7b70f4b886ded3a79413907a472fa3f4cb2fbaaa803a2f98a2f9ae  firmware-samsung-j5x-WCNSS_qcom_wlan_nv.bin.base64
+"