diff --git a/device/testing/device-motorola-falcon/APKBUILD b/device/testing/device-motorola-falcon/APKBUILD
index 9718d199e..add71a953 100644
--- a/device/testing/device-motorola-falcon/APKBUILD
+++ b/device/testing/device-motorola-falcon/APKBUILD
@@ -1,16 +1,24 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-falcon
 pkgdesc="Moto G (2013)"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-motorola-falcon mkbootimg msm-fb-refresher"
+depends="postmarketos-base mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-nonfree-firmware:nonfree_firmware
+	"
+
+source="
+	deviceinfo
+	modules-initfs.mainline
+	"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -20,6 +28,18 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_downstream() {
+	pkgdesc="Downstream kernel"
+	depends="linux-motorola-falcon msm-fb-refresher"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Close to mainline kernel"
+	depends="linux-postmarketos-qcom-msm8226"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
 	depends="firmware-motorola-falcon"
@@ -27,5 +47,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-0f5dcd207dddc60515a6ada744cefa9eab6ef975214d1fc46f5040ad6d1ac0eacafbeea60fadccb777a50c1d8a795faeec061ed21d9e72ee8701ab24be0e7482  deviceinfo
+6898a4f4d08c12780ca80299f8b89067e5598504b4739fad47a6a71cbe4d7cf806cb89d538aceb8f4ed3e0a914c3006acce7b07716d776570fa63845e434f482  deviceinfo
+35701f944fb4d1dd365fb2d3363620271ce748647c7462e9e8d6a2447df766f94cf1d07aa366c66c745fbb0fdaa6960e3f77176f9b6f4f9ca0dbc5d2f5989067  modules-initfs.mainline
 "
diff --git a/device/testing/device-motorola-falcon/deviceinfo b/device/testing/device-motorola-falcon/deviceinfo
index 1471d565c..a81a577b5 100644
--- a/device/testing/device-motorola-falcon/deviceinfo
+++ b/device/testing/device-motorola-falcon/deviceinfo
@@ -6,6 +6,8 @@ deviceinfo_name="Motorola Moto G (2013)"
 deviceinfo_manufacturer="Motorola"
 deviceinfo_codename="motorola-falcon"
 deviceinfo_year="2013"
+deviceinfo_dtb_mainline="msm8226-motorola-falcon"
+deviceinfo_append_dtb_mainline="true"
 deviceinfo_arch="armv7"
 
 # Device related
@@ -18,9 +20,10 @@ deviceinfo_dev_touchscreen="/dev/input/event2"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="androidboot.bootdevice=msm_sdcc.1 androidboot.hardware=qcom vmalloc=400M utags.blkdev=/dev/block/platform/msm_sdcc.1/by-name/utags buildvariant=userdebug"
+deviceinfo_kernel_cmdline_downstream="androidboot.bootdevice=msm_sdcc.1 androidboot.hardware=qcom vmalloc=400M utags.blkdev=/dev/block/platform/msm_sdcc.1/by-name/utags buildvariant=userdebug"
+deviceinfo_kernel_cmdline_mainline="clk_ignore_unused pd_ignore_unused"
 deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="true"
+deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
diff --git a/device/testing/device-motorola-falcon/modules-initfs.mainline b/device/testing/device-motorola-falcon/modules-initfs.mainline
new file mode 100644
index 000000000..6ad39a623
--- /dev/null
+++ b/device/testing/device-motorola-falcon/modules-initfs.mainline
@@ -0,0 +1,3 @@
+msm
+rmi_i2c
+tps65132-regulator