diff --git a/device/community/device-pine64-pinephone/APKBUILD b/device/community/device-pine64-pinephone/APKBUILD
index 5306f22a6..72ef32d23 100644
--- a/device/community/device-pine64-pinephone/APKBUILD
+++ b/device/community/device-pine64-pinephone/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=device-pine64-pinephone
 pkgver=0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -72,7 +72,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi and Bluetooth firmware"
-	depends="linux-firmware-rtlwifi linux-firmware-rtl_bt firmware-rtl8723bt"
+	depends="linux-firmware-rtlwifi linux-firmware-rtl_bt firmware-pine64-rtl8723bt"
 	mkdir "$subpkgdir"
 }
 sha512sums="712dbae8d8799ab251068863d0bc542e29dba7b8783685c1c56fac234c2b7f3f88c360b3bed511f9b83dfb46fc3bf67aa21c185d5d19427d0049c3f54ae4d19e  deviceinfo
diff --git a/device/testing/device-pine64-a64lts/APKBUILD b/device/testing/device-pine64-a64lts/APKBUILD
index 42103b2b6..0247e5bde 100644
--- a/device/testing/device-pine64-a64lts/APKBUILD
+++ b/device/testing/device-pine64-a64lts/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-pine64-a64lts
 pkgdesc="PINE64 A64-LTS"
 pkgver=0.3
-pkgrel=5
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -28,7 +28,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi and Bluetooth firmware"
-	depends="linux-firmware-rtlwifi linux-firmware-rtl_bt firmware-rtl8723bt"
+	depends="linux-firmware-rtlwifi linux-firmware-rtl_bt firmware-pine64-rtl8723bt"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-pine64-dontbeevil/APKBUILD b/device/testing/device-pine64-dontbeevil/APKBUILD
index 30714e448..0c3d14bca 100644
--- a/device/testing/device-pine64-dontbeevil/APKBUILD
+++ b/device/testing/device-pine64-dontbeevil/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-pine64-dontbeevil
 pkgdesc="PINE64 PinePhone Don't be evil devkit"
 pkgver=0.1
-pkgrel=17
+pkgrel=18
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -53,7 +53,7 @@ weston() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi and Bluetooth firmware"
-	depends="linux-firmware-rtlwifi linux-firmware-rtl_bt firmware-rtl8723bt"
+	depends="linux-firmware-rtlwifi linux-firmware-rtl_bt firmware-pine64-rtl8723bt"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-pine64-pinetab/APKBUILD b/device/testing/device-pine64-pinetab/APKBUILD
index 733143f68..98f301ea4 100644
--- a/device/testing/device-pine64-pinetab/APKBUILD
+++ b/device/testing/device-pine64-pinetab/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-pine64-pinetab
 pkgdesc="PINE64 PineTab"
 pkgver=0.1
-pkgrel=21
+pkgrel=22
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -85,7 +85,7 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Bluetooth Firmware"
-	depends="firmware-rtl8723bt"
+	depends="firmware-pine64-rtl8723bt"
 	mkdir "$subpkgdir"
 }
 
diff --git a/firmware/firmware-rtl8723bt/APKBUILD b/firmware/firmware-pine64-rtl8723bt/APKBUILD
similarity index 55%
rename from firmware/firmware-rtl8723bt/APKBUILD
rename to firmware/firmware-pine64-rtl8723bt/APKBUILD
index b8c8b5aa1..25ca1a170 100644
--- a/firmware/firmware-rtl8723bt/APKBUILD
+++ b/firmware/firmware-pine64-rtl8723bt/APKBUILD
@@ -1,18 +1,23 @@
-pkgname=firmware-rtl8723bt
+pkgname=firmware-pine64-rtl8723bt
 pkgver=0_git20181104
 pkgrel=0
 pkgdesc="Firmware for rtl8723bs and rtl8723cs"
 url="https://github.com/anarsoul/rtl8723bt-firmware/"
+subpackages="$pkgname-doc"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck"
 _commit="39da5959deff5041160fa85e62dddb89066471b3"
 source="$pkgname-$_commit.tar.gz::https://github.com/anarsoul/rtl8723bt-firmware/archive/$_commit.tar.gz"
+builddir="$srcdir/rtl8723bt-firmware-$_commit"
 
 package() {
-	cd "$srcdir"/rtl8723bt-firmware-$_commit
-	mkdir -p "$pkgdir"/lib/firmware
-	cp -r rtl_bt "$pkgdir"/lib/firmware
+	make DESTDIR="$pkgdir" install
+
+	# Not sure why this gets installed. Weird.
+	rm "$pkgdir"/lib/firmware/Makefile
+
+	install -Dm644 LICENCE.rtlwifi_firmware.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="8c25196e68eca60e9c14d77a472335187706b1fa0a98da8b3c5afd4d08ea8d430b0ae3187080901bd6917531914096b18fe7e69c048a05140d44cd8689c941fb  firmware-rtl8723bt-39da5959deff5041160fa85e62dddb89066471b3.tar.gz"
+sha512sums="8c25196e68eca60e9c14d77a472335187706b1fa0a98da8b3c5afd4d08ea8d430b0ae3187080901bd6917531914096b18fe7e69c048a05140d44cd8689c941fb  firmware-pine64-rtl8723bt-39da5959deff5041160fa85e62dddb89066471b3.tar.gz"