diff --git a/device/archived/device-qcom-msm8909/APKBUILD b/device/testing/device-qcom-msm8909/APKBUILD
similarity index 72%
rename from device/archived/device-qcom-msm8909/APKBUILD
rename to device/testing/device-qcom-msm8909/APKBUILD
index 7573ae16b..e7f53bf84 100644
--- a/device/archived/device-qcom-msm8909/APKBUILD
+++ b/device/testing/device-qcom-msm8909/APKBUILD
@@ -1,18 +1,20 @@
-# Archived: unmaintained
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
+maintainer="Raymond Hackley <wonderfulshrinemaidenofparadise@postmarketos.org>"
 pkgname=device-qcom-msm8909
 pkgdesc="Generic device package for various Qualcomm MSM8905/MSM8909/MSM8916-based devices"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="
+	firmware-qcom-adreno-a300
+	firmware-qcom-db410c-wcnss-nv
 	linux-postmarketos-qcom-msm8916
+	msm-firmware-loader
 	postmarketos-base
-	soc-qcom-msm8909
+	soc-qcom-msm8916
 "
 makedepends="devicepkg-dev"
 source="
@@ -20,7 +22,6 @@ source="
 	kernel-cmdline.conf
 	modules-initfs
 "
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -28,20 +29,14 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="WiFi/BT/Modem/Video firmware"
-	depends="msm-firmware-loader firmware-qcom-adreno-a300 firmware-qcom-db410c-wcnss-nv"
-	mkdir "$subpkgdir"
 
 	# HACK: For devices that don't have a nv file in persist we
 	# temporarily link the db410c file to the expected location.
 	# It will be overriden if the file is in persist or when user
 	# installs the device-specific firmware packages.
-	mkdir -p "$subpkgdir"/lib/firmware/wlan/prima/
-	ln -s /lib/firmware/qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin \
-		"$subpkgdir"/lib/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin
+	mkdir -p "$pkgdir"/usr/lib/firmware/wlan/prima/
+	ln -s /usr/lib/firmware/qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin \
+		"$pkgdir"/usr/lib/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin
 }
 
 sha512sums="
diff --git a/device/archived/device-qcom-msm8909/deviceinfo b/device/testing/device-qcom-msm8909/deviceinfo
similarity index 100%
rename from device/archived/device-qcom-msm8909/deviceinfo
rename to device/testing/device-qcom-msm8909/deviceinfo
diff --git a/device/archived/device-qcom-msm8909/kernel-cmdline.conf b/device/testing/device-qcom-msm8909/kernel-cmdline.conf
similarity index 100%
rename from device/archived/device-qcom-msm8909/kernel-cmdline.conf
rename to device/testing/device-qcom-msm8909/kernel-cmdline.conf
diff --git a/device/archived/device-qcom-msm8909/modules-initfs b/device/testing/device-qcom-msm8909/modules-initfs
similarity index 100%
rename from device/archived/device-qcom-msm8909/modules-initfs
rename to device/testing/device-qcom-msm8909/modules-initfs