diff --git a/device/testing/device-generic-x86_64/APKBUILD b/device/testing/device-generic-x86_64/APKBUILD
index 83c134a6f..0ced936bb 100644
--- a/device/testing/device-generic-x86_64/APKBUILD
+++ b/device/testing/device-generic-x86_64/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=10
-pkgrel=1
+pkgver=11
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -22,6 +22,9 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-kernel-lts:kernel_lts
 	$pkgname-mesa
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-amd:nonfree_firmware_amd
+	$pkgname-nonfree-firmware-intel:nonfree_firmware_intel
 "
 _pmb_recommends="
 	oem-intel
@@ -62,6 +65,26 @@ kernel_lts() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Firmware for x86_64 devices"
+
+	mkdir -p "$subpkgdir"
+}
+
+nonfree_firmware_amd() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel oem-amd"
+	depends="oem-amd-nonfree-firmware"
+
+	mkdir -p "$subpkgdir"
+}
+
+nonfree_firmware_intel() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel oem-intel"
+	depends="oem-intel-nonfree-firmware"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 33f0450413c7b364390fdc715578b41389bced5ff69f04a2128155f5ad828ed0e1cc17a20b610eccf4bd99560e21be91e362faaa72e9decad4623f8669e8ab7a  deviceinfo
 7e968698e54583023cc73a9dec0c15ef91d6eb24ad31f0ce531a6eada0ff2dceb22c9edc443bf7cef362a9a5b23ea95d698c217e1f780495029f4a5451ed2882  modules-initfs