diff --git a/device/testing/device-mobvoi-skipjack/APKBUILD b/device/testing/device-mobvoi-skipjack/APKBUILD
index e47483bdf..b7319838e 100644
--- a/device/testing/device-mobvoi-skipjack/APKBUILD
+++ b/device/testing/device-mobvoi-skipjack/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-mobvoi-skipjack
 pkgdesc="Mobvoi Ticwatch C2"
-pkgver=0.1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -14,6 +14,11 @@ depends="
 	postmarketos-base
 	mdss-fb-init-hack
 "
+subpackages="
+	$pkgname-nonfree-firmware-modem:nonfree_firmware_modem
+	$pkgname-nonfree-firmware-venus:nonfree_firmware_venus
+	$pkgname-nonfree-firmware-wcnss:nonfree_firmware_wcnss
+"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 
@@ -25,6 +30,24 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware_modem() {
+	pkgdesc="Modem firmware"
+	depends="firmware-mobvoi-skipjack-modem"
+	mkdir "$subpkgdir"
+}
+
+nonfree_firmware_venus() {
+	pkgdesc="GPU firmware"
+	depends="firmware-mobvoi-skipjack-venus"
+	mkdir "$subpkgdir"
+}
+
+nonfree_firmware_wcnss() {
+	pkgdesc="WiFi/Bluetooth firmware"
+	depends="firmware-mobvoi-skipjack-wcnss"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 8ec2903bf1c6ebd955fd22fdf1883b7bfdef2d9c58d8f68a81c46de2b2554e10f45671f0de0b35165aa53b270fd6938d78040c2a74b9044b5d32c05afef4f9f5  deviceinfo
 "
diff --git a/device/testing/firmware-mobvoi-skipjack/APKBUILD b/device/testing/firmware-mobvoi-skipjack/APKBUILD
new file mode 100644
index 000000000..17f4e27ae
--- /dev/null
+++ b/device/testing/firmware-mobvoi-skipjack/APKBUILD
@@ -0,0 +1,41 @@
+pkgname=firmware-mobvoi-skipjack
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware for mobvoi-skipjack (Ticwatch C2+)"
+url="https://github.com/ptrcnull/firmware-mobvoi-skipjack"
+arch="armv7"
+license="proprietary"
+subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
+options="!check !strip !archcheck !spdx !tracedeps pmb:cross-native"
+
+_commit="02d507b1c0d138dc8e57c9ac36e8b9c51f32c635"
+source="$url/archive/$_commit.tar.gz"
+builddir="$srcdir/firmware-mobvoi-skipjack-$_commit"
+
+_fwdir="/lib/firmware/postmarketos"
+
+package() {
+	# parent package is empty
+	mkdir -p "$pkgdir"
+}
+
+modem() {
+	pkgdesc="Ticwatch C2+ (mobvoi-skipjack) modem firmware"
+	install -Dm644 "$builddir"/modem.* -t "$subpkgdir/$_fwdir"
+}
+
+venus() {
+	pkgdesc="Ticwatch C2+ (mobvoi-skipjack) GPU firmware"
+	install -Dm644 "$builddir"/venus.* -t "$subpkgdir/$_fwdir"
+}
+
+wcnss() {
+	depends="wcnss-wlan"
+	pkgdesc="Ticwatch C2+ (mobvoi-skipjack) WiFi/BT firmware"
+	install -Dm644 "$builddir"/wcnss.* -t "$subpkgdir/$_fwdir"
+	install -Dm644 "$builddir"/wlan/prima/WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima
+}
+
+sha512sums="
+c73dddb4748d69abe30a43a839bce81867c91fe7511f04f53861195a5615c283ab932108c9a65e37935aa35586b020e342a85a189057bdbb98ef1dcd9a03cde7  02d507b1c0d138dc8e57c9ac36e8b9c51f32c635.tar.gz
+"