diff --git a/device/testing/device-motorola-surnia/APKBUILD b/device/testing/device-motorola-surnia/APKBUILD
index 788bc10d4..da39a252b 100644
--- a/device/testing/device-motorola-surnia/APKBUILD
+++ b/device/testing/device-motorola-surnia/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-motorola-surnia
 pkgdesc="Motorola Moto E (2nd Gen)"
 pkgver=0.1
-pkgrel=5
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -11,6 +11,11 @@ depends="postmarketos-base linux-motorola-surnia mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-modem:nonfree_firmware_modem
+"
+
 build() {
 	devicepkg_build $startdir $pkgname
 }
@@ -19,4 +24,17 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="GPU/Wi-Fi/Bluetooth/Video(/Modem) firmware"
+	depends="linux-firmware-qcom firmware-motorola-surnia-wcnss firmware-motorola-surnia-venus"
+	mkdir "$subpkgdir"
+}
+
+nonfree_firmware_modem() {
+	pkgdesc="Modem firmware"
+	depends="firmware-motorola-surnia-modem"
+	install_if="$pkgname-nonfree-firmware"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="bcbfe1bb816456915ccbb9faf3ff519c9a9de5a95e105458036b7f6fd9384d391a573f215864b21278c959a22320df08cc206777498126f978676e8129b1a557  deviceinfo"
diff --git a/device/testing/firmware-motorola-surnia/APKBUILD b/device/testing/firmware-motorola-surnia/APKBUILD
new file mode 100644
index 000000000..fa0728aab
--- /dev/null
+++ b/device/testing/firmware-motorola-surnia/APKBUILD
@@ -0,0 +1,41 @@
+pkgname=firmware-motorola-surnia
+pkgver=0.1
+pkgrel=0
+pkgdesc="Firmware for Motorola Moto E 2015 (2nd gen)"
+url="https://github.com/linuxgorl/vendor_motorola_surnia"
+subpackages="$pkgname-wcnss $pkgname-venus $pkgname-modem"
+arch="armhf"
+license="proprietary"
+options="!check !strip !archcheck"
+
+_commit="b8dbec48197c086d22371d360fa41387880a1dcb"
+source="$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz"
+
+_fwdir="/lib/firmware/postmarketos"
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+wcnss() {
+	pkgdesc="Motorola Moto E 2015 (2nd gen) Wi-Fi/Bluetooth firmware"
+	cd "$srcdir/vendor_motorola_surnia-$_commit"
+	install -Dm644 wcnss.* -t "$subpkgdir/$_fwdir"
+	install -Dm644 wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir/wlan/prima"
+}
+
+venus() {
+	pkgdesc="Motorola Moto E 2015 (2nd gen) video firmware"
+	cd "$srcdir/vendor_motorola_surnia-$_commit"
+	install -Dm644 venus.b* -t "$subpkgdir/$_fwdir"
+	install -Dm644 venus.mdt -t "$subpkgdir/$_fwdir"
+}
+
+modem() {
+	pkgdesc="Motorola Moto E 2015 (2nd gen) modem firmware"
+	cd "$srcdir/vendor_motorola_surnia-$_commit"
+	install -Dm644 modem.* -t "$subpkgdir/$_fwdir"
+	install -Dm644 mba.mbn -t "$subpkgdir/$_fwdir"
+}
+
+sha512sums="859f81ef316ee025245e217e8bca891c89dade23781cc386d6c930608cbd8aba78b0f3c93a0ad1a265ba20554379fe60331e32c1924ee4dd9151f8c146be347f  firmware-motorola-surnia-b8dbec48197c086d22371d360fa41387880a1dcb.tar.gz"