diff --git a/device/testing/device-asus-flo/APKBUILD b/device/testing/device-asus-flo/APKBUILD
index 1d50dbb28..7160412ab 100644
--- a/device/testing/device-asus-flo/APKBUILD
+++ b/device/testing/device-asus-flo/APKBUILD
@@ -1,14 +1,19 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: David Heidelberg <david@ixit.cz>
 pkgname=device-asus-flo
-pkgver=0
-pkgrel=27
-pkgdesc="Google Nexus 7 2013 flo"
+pkgver=1
+pkgrel=0
+pkgdesc="Google Nexus 7 2013 (flo)"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-asus-flo mkbootimg mesa-dri-freedreno"
+depends="postmarketos-base mkbootimg"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-weston $pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-weston
+	$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-android-touch-dev.rules wpa_supplicant.conf pointercal weston.ini"
 
 options="!check !archcheck"
@@ -33,6 +38,18 @@ weston() {
 		"$subpkgdir"/etc/xdg/weston/weston.ini
 }
 
+kernel_downstream() {
+	pkgdesc="GPU works somehow, very old"
+	depends="linux-asus-flo mesa-dri-freedreno"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="linux-next kernel, install only for development!"
+	depends="linux-postmarketos-qcom-apq8064"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
 	depends="firmware-asus-flo"
@@ -40,7 +57,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-4e0173dc8dce37fb974a3fd5c5be8b22d8eeee8a431b6b4c830fde1895e355b9dd19079d9b36111acb2dd811c1470c593f1586f5568fe023f2fa0353574abe4b  deviceinfo
+4e8007a001f45860ed9a6d7f5d3d768b90661db148587358dcc2d24a83a9c784114b2559eb3c55cbaa28e695a07a675e4ae668544b9ee4333d03f268266f9aea  deviceinfo
 5ac89b627f52d2f1103c3329bd905cdbb906cae5bb332d52e6805d7971fbcc0faabe1fd9d2beb7c6de4e4487c05047eaa17852dbf9e114ee3c5d4b0d57d73859  90-android-touch-dev.rules
 3278921cc1617d10fdd13dfbeaf213cda0078d069e727acd8cfac10bd8ade6f373be1e22fd1e4b50ae71cd2eae09f7d6aad5de42338d9ea9f8c1a34f0b60cb69  wpa_supplicant.conf
 cf913217b41a3dde8bc2a16a5bc82013c85679de0e81db1cfc36f2409ea034fec430082ddcb207c16746453601cf8381300b049cd2fb131f1916dc7dbcc247e3  pointercal
diff --git a/device/testing/device-asus-flo/deviceinfo b/device/testing/device-asus-flo/deviceinfo
index cefef2298..b833eed08 100644
--- a/device/testing/device-asus-flo/deviceinfo
+++ b/device/testing/device-asus-flo/deviceinfo
@@ -10,6 +10,8 @@ deviceinfo_chassis="tablet"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_flash_method="fastboot"
+deviceinfo_append_dtb="true"
+deviceinfo_dtb="qcom-apq8064-asus-nexus7-flo"
 deviceinfo_arch="armv7"
 deviceinfo_gpu_accelerated="true"