diff --git a/device/testing/device-motorola-falcon/APKBUILD b/device/testing/device-motorola-falcon/APKBUILD
index 99f8aec55..7ba7133b7 100644
--- a/device/testing/device-motorola-falcon/APKBUILD
+++ b/device/testing/device-motorola-falcon/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-motorola-falcon
 pkgdesc="Moto G (2013)"
 pkgver=0.1
-pkgrel=10
+pkgrel=11
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -10,6 +10,7 @@ options="!check !archcheck"
 depends="postmarketos-base linux-motorola-falcon mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -19,4 +20,10 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-motorola-falcon"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="5a91a78c6e0178fe5912bf60a3dc14f832f2f4e27e4da7eb57949588da676e650d2b638aad8e5b5b15d7268f5a9be6372b8d5acb03bfdb9e871f337f086218ca  deviceinfo"
diff --git a/firmware/firmware-motorola-falcon/APKBUILD b/firmware/firmware-motorola-falcon/APKBUILD
new file mode 100644
index 000000000..c07adf153
--- /dev/null
+++ b/firmware/firmware-motorola-falcon/APKBUILD
@@ -0,0 +1,30 @@
+pkgname=firmware-motorola-falcon
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware files for Motorola Moto G 2013 (falcon)"
+url="https://postmarketos.org"
+arch="armhf"
+license="proprietary"
+depends="wcnss-wlan"
+options="!check !strip !archcheck"
+_commit="a4b3ead9368499ebfa8c2d8a0ababb1c1bf8db4d"
+_url="https://github.com/fbraghiroli/vendor_motorola_falcon"
+source="$pkgname-$_commit.tar.gz::$_url/archive/$_commit.tar.gz"
+builddir="$srcdir/vendor_motorola_falcon-$_commit"
+
+package() {
+	_files="wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b06 wcnss.b07
+		wcnss.b08 wcnss.b09 wcnss.mdt"
+	for _i in $_files; do
+		install -D -m644 "$_i" "$pkgdir/lib/firmware/postmarketos/$_i"
+	done
+
+	_files="WCNSS_cfg.dat WCNSS_qcom_cfg.ini
+		WCNSS_qcom_wlan_nv.bin WCNSS_qcom_wlan_factory_nv.bin"
+	for _i in $_files; do
+		install -D -m644 "wlan/prima/$_i" \
+			"$pkgdir/lib/firmware/postmarketos/wlan/prima/$_i"
+	done
+}
+
+sha512sums="54058c3d34307d0a1ab7a95b04b52a26a5b1446b05af594a9787931619f1b4dfb1c279f3ba78079a450ddc86aeb0d8507109feb20327b6c3d2477f946ee2aa9f  firmware-motorola-falcon-a4b3ead9368499ebfa8c2d8a0ababb1c1bf8db4d.tar.gz"