diff --git a/device/testing/device-htc-memul/APKBUILD b/device/testing/device-htc-memul/APKBUILD
index 7f4d0e4d7..3439e25ce 100644
--- a/device/testing/device-htc-memul/APKBUILD
+++ b/device/testing/device-htc-memul/APKBUILD
@@ -1,17 +1,27 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-memul
 pkgdesc="HTC One Mini 2"
-pkgver=0.1
-pkgrel=8
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-htc-memul mkbootimg"
+depends="
+	mkbootimg
+	postmarketos-base
+	"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo
-	initfs-hook.sh"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-nonfree-firmware:nonfree_firmware
+	"
+source="
+	deviceinfo
+	initfs-hook.sh
+	modules-initfs.mainline
+	"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -21,6 +31,21 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_downstream() {
+	pkgdesc="Downstream kernel"
+	depends="linux-htc-memul"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+
+	amove etc/udev/rules.d/90-$pkgname.rules
+	amove usr/share/mkinitfs/hooks/00-$pkgname.sh
+}
+
+kernel_mainline() {
+	pkgdesc="Close to mainline kernel"
+	depends="linux-postmarketos-qcom-msm8226"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 nonfree_firmware() {
 	pkgdesc="Firmware for WiFi, etc."
 	depends="firmware-htc-memul-wcnss wcnss-wlan"
@@ -28,6 +53,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-e37873e774fc221c068f0bd960ffeb2ec7ee03ad5d3a09f331afe18d1931e712d4c8ccfed0ccae9405a40a070ce82aa77b0545fdbb06513a97ac588d4712ab79  deviceinfo
+e9126be42f77466b0823327e4c2fc84caf48ff34e970b08c1427c48e5531a2a627b698bde0d9db838a949cbccdd20fa394327a699051ebea3abae9dc91ee6367  deviceinfo
 765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb  initfs-hook.sh
+9ebe6ca9e371b5091e4e47ecbe3ec0c72d055e4bc2281880119eb0dee4c56b71f20f7d3cf1f1cb62e6814604e745fb17bbbfcfed2fec42398871e50b17685533  modules-initfs.mainline
 "
diff --git a/device/testing/device-htc-memul/deviceinfo b/device/testing/device-htc-memul/deviceinfo
index cfc7ca299..cdf67df87 100644
--- a/device/testing/device-htc-memul/deviceinfo
+++ b/device/testing/device-htc-memul/deviceinfo
@@ -6,6 +6,8 @@ deviceinfo_name="HTC One Mini 2"
 deviceinfo_manufacturer="HTC"
 deviceinfo_codename="htc-memul"
 deviceinfo_year="2014"
+deviceinfo_dtb_mainline="qcom-msm8926-htc-memul"
+deviceinfo_append_dtb_mainline="true"
 deviceinfo_arch="armv7"
 
 # Device related
@@ -18,13 +20,12 @@ deviceinfo_dev_touchscreen="/dev/input/event6"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="console=none androidboot.hardware=qcom user_debug=31 ehci-hcd.park=3 zcache buildvariant=userdebug"
+deviceinfo_kernel_cmdline_downstream="console=none androidboot.hardware=qcom user_debug=31 ehci-hcd.park=3 zcache buildvariant=userdebug"
 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="0x02008000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
-
diff --git a/device/testing/device-htc-memul/modules-initfs.mainline b/device/testing/device-htc-memul/modules-initfs.mainline
new file mode 100644
index 000000000..6c534ac0b
--- /dev/null
+++ b/device/testing/device-htc-memul/modules-initfs.mainline
@@ -0,0 +1,3 @@
+msm
+panel-htc-memul-novatek35521
+rmi_i2c