diff --git a/device/linux-samsung-golden/05_change_dhd_firmware_path.patch b/device/linux-samsung-golden/05_change_dhd_firmware_path.patch
index 520334efb..a99bad778 100644
--- a/device/linux-samsung-golden/05_change_dhd_firmware_path.patch
+++ b/device/linux-samsung-golden/05_change_dhd_firmware_path.patch
@@ -8,8 +8,8 @@ index ed549c3..09e83f6 100644
   */
 -char firmware_path[MOD_PARAM_PATHLEN] = "/system/etc/wifi/bcmdhd_sta.bin";
 -char nvram_path[MOD_PARAM_PATHLEN] = "/system/etc/wifi/nvram_net.txt";
-+char firmware_path[MOD_PARAM_PATHLEN]="/lib/firmware/postmarketos/bcmdhd_sta.bin";
-+char nvram_path[MOD_PARAM_PATHLEN]="/lib/firmware/postmarketos/nvram_net.txt";
- 
++char firmware_path[MOD_PARAM_PATHLEN]="/lib/firmware/postmarketos/brcm/brcmfmac4334-sdio.bin";
++char nvram_path[MOD_PARAM_PATHLEN]="/lib/firmware/postmarketos/brcm/brcmfmac4334-sdio.samsung,golden.txt";
+
  /* information string to keep firmware, chio, cheip version info visiable from log */
  char info_string[MOD_PARAM_INFOLEN];
diff --git a/device/linux-samsung-golden/APKBUILD b/device/linux-samsung-golden/APKBUILD
index 6152667ab..39bd59703 100644
--- a/device/linux-samsung-golden/APKBUILD
+++ b/device/linux-samsung-golden/APKBUILD
@@ -2,7 +2,7 @@
 
 pkgname="linux-samsung-golden"
 pkgver=3.0.31
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy SIII mini kernel fork"
 arch="armv7"
 _carch="arm"
@@ -82,7 +82,7 @@ package() {
 		error "Could not find zImage in $PWD!"
 		return 1
 	fi
-	
+
 	# Modules
 	cd "$builddir"
 	unset LDFLAGS
@@ -100,4 +100,4 @@ ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41
 a2bb98fb8d988bbb659cae00fbaca360828300e9b98b90aed5ee0dd839c3f740696df4094a9021b813cbada06820d115aabed581a47cdd2c947e8d853c20b145  02_timeconst_fix.patch
 6585c67450f1ef6d0c165ce4cb5c64f64d779147d1390558bf72cd40da5a33d53de6fd3c67e5ab864c14b3f67602bbe3060eea07c85b19bb82a0735024b369eb  03_fix_rndis.patch
 31fe10c659d59fd086b49c20412a27cc6241e650cda1200efe86cedfc5d9ac380a3c7ff931161a40b26ab49b6e3fa04d27316efd66fba6605a5e35ef526b41e4  04_fix_bcma.patch
-4d509ef6b004834cff731cfc57016efcd9d375d3d39de41a2ecb93573af781761bd498904887997824e0bb48de6a5ee4e39a8d7763adef165c5bcc3c62a897f2  05_change_dhd_firmware_path.patch"
+3665c85be5fb7931f6e83fa98a6c4ab876f97949cfbbe04bdcfe1175ed5ef6fdb3c12558d678d30f6c60f5fa5e79cf7aa8fe1910e4bd36ee1ba0f20cef9163ea  05_change_dhd_firmware_path.patch"
diff --git a/firmware/firmware-samsung-golden/APKBUILD b/firmware/firmware-samsung-golden/APKBUILD
index f0338da91..96481358f 100644
--- a/firmware/firmware-samsung-golden/APKBUILD
+++ b/firmware/firmware-samsung-golden/APKBUILD
@@ -1,23 +1,25 @@
 pkgname=firmware-samsung-golden
-pkgver=1
+pkgver=2
 pkgrel=0
-pkgdesc="Samsung Galaxy SIII mini proprietary firmware"
-url="https://github.com/3liteking148/android_vendor_samsung_golden"
+pkgdesc="Firmware for Samsung Galaxy S III mini"
+url="https://pepethekingprawn.gitlab.io/firmware/"
 arch="armv7"
 license="proprietary"
-options="!check !strip"
+options="!check !strip !archcheck"
+source="https://pepethekingprawn.gitlab.io/firmware/GT-I8190.tar.xz"
+builddir="$srcdir"
 
-# Source
-_commit="3ca5e3fac6f68263bbe4ef72887cc8c3f10fed4c"
-source=$pkgname-$_commit.tar.gz::$url"/archive/${_commit}.tar.gz"
+_fwdir="/lib/firmware/postmarketos"
 
 package() {
-	cd "$srcdir/android_vendor_samsung_golden-${_commit}/proprietary/"
+	# WiFi
+	install -Dm644 bcmdhd_sta.bin_b2 \
+		"$pkgdir/$_fwdir"/brcm/brcmfmac4334-sdio.bin
+	install -Dm644 nvram_net.txt_GPIO4 \
+		"$pkgdir/$_fwdir"/brcm/brcmfmac4334-sdio.samsung,golden.txt
 
-	# Wifi
-	install -Dm644 "etc/wifi/bcmdhd_sta.bin" \
-		"$pkgdir/lib/firmware/postmarketos/bcmdhd_sta.bin"
-	install -Dm644 "etc/wifi/nvram_net.txt" \
-		"$pkgdir/lib/firmware/postmarketos/nvram_net.txt"
+	# Bluetooth
+	install -Dm644 bcm4334.hcd "$pkgdir/$_fwdir"/brcm/BCM4334B0.hcd
 }
-sha512sums="b1d39e4d2180585970d7c06eca424aa784d76b8ccb020dc0768f683e8fd1e68e4487213c021db33ec40141f09db1879d53851110fc89d4e57e2205d1788904a3  firmware-samsung-golden-3ca5e3fac6f68263bbe4ef72887cc8c3f10fed4c.tar.gz"
+
+sha512sums="d9ad7a2d593ecef40252e85fd0d2b65d54aaed911e80c516f211573a8f42d9fc18303d7c2b55dd37e5027ca8bc42289b5dbccb9008ab20f902f30e4394704912  GT-I8190.tar.xz"