diff --git a/firmware/firmware-samsung-p4wifi/APKBUILD b/firmware/firmware-samsung-p4wifi/APKBUILD
index 75264c426..25ba54e70 100644
--- a/firmware/firmware-samsung-p4wifi/APKBUILD
+++ b/firmware/firmware-samsung-p4wifi/APKBUILD
@@ -1,34 +1,28 @@
 pkgname=firmware-samsung-p4wifi
 pkgver=2
-pkgrel=0
+pkgrel=1
+_commit_fw="e0e37239ad4aead6316a6f913696a1c71dfbde7d"
+_commit_nvram="216172bddf07ea19fc05cc932ebb0b449a3d84d6"
 pkgdesc="Samsung Galaxy Tab 10.1 Firmware"
 url="https://github.com/Decatf"
 arch="armv7"
 license="proprietary"
-options="!check"
-
-# Source
-_fw_file="bcmdhd_sta.bin"
-_nvram_file="nvram_net.txt"
-_commit_fw="e0e37239ad4aead6316a6f913696a1c71dfbde7d"
-_commit_nvram="216172bddf07ea19fc05cc932ebb0b449a3d84d6"
-_url_fw="https://github.com/Decatf/android_device_samsung_p4-common/raw/$_commit_fw/wifi/$_fw_file"
-_url_nvram="https://github.com/Decatf/android_vendor_samsung_p4wifi/raw/$_commit_nvram/proprietary/etc/wifi/$_nvram_file"
-
-source=""
-source="$source $pkgname-$_commit_fw-$_fw_file::$_url_fw";
-source="$source $pkgname-$_commit_nvram-$_nvram_file::$_url_nvram";
+source="$pkgname-$_commit_fw-fw.tar.gz::https://github.com/Decatf/android_device_samsung_p4-common/archive/$_commit_fw.tar.gz
+	$pkgname-$_commit_nvram-nvram.tar.gz::https://github.com/Decatf/android_vendor_samsung_p4wifi/archive/$_commit_nvram.tar.gz"
+options="!check !archcheck !strip !spdx"
+builddir="$srcdir/android_device_samsung_p4-common-$_commit_fw"
 
 package() {
-	install -Dm644 "$srcdir/$pkgname-$_commit_fw-$_fw_file" \
-		"$pkgdir/lib/firmware/postmarketos/$_fw_file"
-	install -Dm644 "$srcdir/$pkgname-$_commit_nvram-$_nvram_file" \
-		"$pkgdir/lib/firmware/postmarketos/$_nvram_file"
+	install -Dm644 wifi/bcmdhd_sta.bin \
+		"$pkgdir"/lib/firmware/postmarketos/bcmdhd_sta.bin
+	install -Dm644 wifi/bcmdhd_sta.bin \
+		"$pkgdir"/lib/firmware/postmarketos/brcm/brcmfmac4330-sdio.bin
 
-	install -Dm644 "$srcdir/$pkgname-$_commit_fw-$_fw_file" \
-		"$pkgdir/lib/firmware/postmarketos/brcm/brcmfmac4330-sdio.bin"
-	install -Dm644 "$srcdir/$pkgname-$_commit_nvram-$_nvram_file" \
-		"$pkgdir/lib/firmware/postmarketos/brcm/brcmfmac4330-sdio.txt"
+	cd "$srcdir/android_vendor_samsung_p4wifi-$_commit_nvram"
+	install -Dm644 proprietary/etc/wifi/nvram_net.txt \
+		"$pkgdir"/lib/firmware/postmarketos/nvram_net.txt
+	install -Dm644 proprietary/etc/wifi/nvram_net.txt \
+		"$pkgdir"/lib/firmware/postmarketos/brcm/brcmfmac4330-sdio.txt
 }
-sha512sums="ef70cd280d5febcce7387eceb0ef8a7c3d389dfdad4bb7b4631b4dccd7fe55034d1857f79349969d1e104a8dd7d3c2db84eb623c566711aa5072bc2d8145d4b7  firmware-samsung-p4wifi-e0e37239ad4aead6316a6f913696a1c71dfbde7d-bcmdhd_sta.bin
-4da8ad7e2ee59f2edbd9bb344e55ed7513e6929bbe5c53eb96999ef7d2b18e2a3b10e5d1567606e1332fd254d8aeb4d5554fbef82ea1a761917c2fdc1ad964de  firmware-samsung-p4wifi-216172bddf07ea19fc05cc932ebb0b449a3d84d6-nvram_net.txt"
+sha512sums="81bd67e7153b73c7ba63e546fecf222e9065b9aa6d99a1ea78046f2c6e9ad0a255b4e12f5f57b23584d3a4b5e5ff19416f2fcdf09def7aba715bdb9f34d72604  firmware-samsung-p4wifi-e0e37239ad4aead6316a6f913696a1c71dfbde7d-fw.tar.gz
+20eaa172a65ae31b8f95a81c22f2e6e768c6cb8828253313a5d4d55703a476e7ad57b6d430902caf980df24631144fa2a862f0f051c4485dae93dbaf851c2647  firmware-samsung-p4wifi-216172bddf07ea19fc05cc932ebb0b449a3d84d6-nvram.tar.gz"