diff --git a/device/device-motorola-osprey/APKBUILD b/device/device-motorola-osprey/APKBUILD
index 6d6aac2ea..bcc4ed683 100644
--- a/device/device-motorola-osprey/APKBUILD
+++ b/device/device-motorola-osprey/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-motorola-osprey
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Motorola Moto G 3rd gen. (2015)"
 url="https://postmarketos.org"
 arch="noarch"
@@ -23,7 +23,7 @@ package() {
 		"$pkgdir"/etc/profile.d/00-fb-workaround.sh
 }
 
-sha512sums="beeae4bc4d2c332391e7b10c620608ed1d4cad2db528032bf11406e0686a0850482dfd77a86d34a3f7e8ab8392c3ddb521527f6dbbfebba1755ab6a9f47d6237  deviceinfo
+sha512sums="0040ac9735f63d9375642fe5e1afd088985117ca89b9697f8688dc5a45e50d3ff75179e55b5c92a6b36d67cd581f29b03892060db3b2266888fb3c19140cff1b  deviceinfo
 3e9d6bf1bd45328104b91b724472ac0e39cb595fb87f84b6793527019477a73234ae37d33e99419bc5810c018402ea6e68e76c26ace112ee11efc416ac0a7398  initfs-hook.sh
 60597699b58aca14a1696329eba4ffb46d98c721d442fb024752e3301ea992ac1727d4609083a299573115288d2039c17831e7c70c2ffdd195a3c20323e6b5fb  90-android-touch-dev.rules
 857da7bfe3a44d960ca1c05f8646eedd16140fa339f3b0421353f6cdb4b42f8e5c6457522e70c2eb2f76717404c688c0d92525b9d1e99895f3febb5ae3687420  fb-workaround.sh"
diff --git a/device/device-motorola-osprey/deviceinfo b/device/device-motorola-osprey/deviceinfo
index a0ea9e64c..c4dfb5aee 100644
--- a/device/device-motorola-osprey/deviceinfo
+++ b/device/device-motorola-osprey/deviceinfo
@@ -18,10 +18,15 @@ deviceinfo_arch="armhf"
 deviceinfo_screen_width="720"
 deviceinfo_screen_height="1280"
 
-# Fastboot related
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x3F ehci-hcd.park=3 vmalloc=400M androidboot.bootdevice=7824900.sdhci utags.blkdev=/dev/block/bootdevice/by-name/utags utags.backup=/dev/block/bootdevice/by-name/utagsBackup movablecore=160M"
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="true"
+deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
+
diff --git a/device/linux-motorola-osprey/APKBUILD b/device/linux-motorola-osprey/APKBUILD
index aa65e5fbd..1f3487a3d 100644
--- a/device/linux-motorola-osprey/APKBUILD
+++ b/device/linux-motorola-osprey/APKBUILD
@@ -1,15 +1,3 @@
-# APKBUILD based on linux-vanilla aport. Changes:
-# - disabled module installation
-# - add !check !tracedeps
-# - package: just install zimage and kernel.release, because the kernel config
-#	does not generate modules or dtb files
-# - do not create -dev subpackage (makes no sense without module support)
-#
-# Kernel config based on: arch/arm/configs/lineageos_mako_defconfig
-# Changes:
-# - enable devtmpfs (needed for udev -> touch support in weston)
-# - disable ANDROID_PARANOID_NETWORK (removes network restrictions)
-
 _vendor=motorola
 _flavor=motorola-osprey
 _hash="ac87541051278c7ea7f494c0b689d08e4a5cdd4f"
@@ -21,12 +9,12 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=3
+pkgrel=4
 arch="armhf"
 pkgdesc="Moto G (2015) kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_motorola_msm8916"
 depends=""
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev"
+makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev dtbtool"
 options="!strip !check !tracedeps"
 install=
 source="
@@ -83,14 +71,39 @@ build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
+	# Generate dt.img
+	dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot"
 }
 
 package() {
-	install -Dm644 "$srcdir/build/arch/arm/boot/zImage" \
-		"$pkgdir/boot/vmlinuz-$_flavor"
-
-	install -D "$srcdir/build/include/config/kernel.release" \
+	export builddir="$srcdir"/build
+	# kernel.release
+	install -D "$builddir/include/config/kernel.release" \
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
+
+	# zImage (find the right one)
+	cd "$builddir/arch/$_carch/boot"
+	_target="$pkgdir/boot/vmlinuz-$_flavor"
+	for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
+		[ -e "$_zimg" ] || continue
+		msg "zImage found: $_zimg"
+		install -Dm644 "$_zimg" "$_target"
+		break
+	done
+	if ! [ -e "$_target" ]; then
+		error "Could not find zImage in $PWD!"
+		return 1
+	fi
+
+	# Master DTB (deviceinfo_bootimg_qcdt)
+	install -Dm644 "$builddir/arch/arm/boot/dt.img" \
+		"$pkgdir/boot/dt.img"
+
+        cd "$srcdir"/build
+
+        make -j1 modules_install \
+                ARCH="$_carch" \
+                INSTALL_MOD_PATH="$pkgdir"
 }
 
 sha512sums="fbc2e1fa6ff33dd4c20bb063c655fe85ee20c194a9c19a5fadd3434b8ade4b95377848349ce9266d74ca34882446e1e257c0e1a3e35bd23ff05813918dc74750  linux-motorola-osprey-ac87541051278c7ea7f494c0b689d08e4a5cdd4f.tar.gz