diff --git a/aports/linux-nokia-rx51/APKBUILD b/aports/linux-nokia-rx51/APKBUILD
index c74d7962..c086f3a0 100644
--- a/aports/linux-nokia-rx51/APKBUILD
+++ b/aports/linux-nokia-rx51/APKBUILD
@@ -25,7 +25,7 @@ arch="armhf"
 pkgdesc="Mainline Linux for the Nokia N900"
 url="https://github.com/pali/linux-n900"
 depends="postmarketos-mkinitfs"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev"
+makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev uboot-tools"
 options="!strip !check !tracedeps"
 install=
 source="
@@ -90,12 +90,23 @@ build() {
 }
 
 package() {
-	install -Dm644 "$srcdir/build/arch/arm/boot/zImage" \
-		"$pkgdir/boot/vmlinuz-$_flavor"
+	cd "$srcdir/build/arch/arm/boot"
+	
+	cat zImage dts/omap3-n900.dtb > zImage-dtb
+	mkimage -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 -n postmarketos -d zImage-dtb uImage
+
+	install -Dm644 "$srcdir/build/arch/arm/boot/uImage" \
+		"$pkgdir/boot/uImage"
+
+	install -Dm644 "$srcdir/build/arch/arm/boot/zImage-dtb" \
+		"$pkgdir/boot/zImage-dtb"
+
+	install -Dm644 "$srcdir/build/arch/arm/boot/dts/omap3-n900.dtb" \
+		"$pkgdir/boot/omap3-n900.dtb"
 
 	install -D "$srcdir/build/include/config/kernel.release" \
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 
 sha512sums="ad1288233893ce3de9c81f4672f4f2439c8d6665a0a0289f5cbe826fd08c69292de02a2fd9856dcd6d91c7f6930273319e1888bf0a146aee3a4e1ff50f6f7b19  linux-nokia-rx51-7b6fbfd899b4133e4f789843e5967beb139ec4d2.tar.gz
-6bdc31f83806cb1398bf9304755a3c35dd60be35d424149118ddbe72c78ad4ffa7296a9d5f141a1c68865e673aa2d9ba370223b0460b4ea202a476cb7ed99771  config-nokia-rx51.armhf"
+6b9ef5266bf95314b76c6973036b8e66cfa3b27efee84524f8c9a4316cbc29e289b1d56c99d8bcdf5516bdc743ab1a2bea4b277d3cff88d0e07de4b514d65e77  config-nokia-rx51.armhf"
diff --git a/aports/linux-nokia-rx51/config-nokia-rx51.armhf b/aports/linux-nokia-rx51/config-nokia-rx51.armhf
index 5e663334..529da7ba 100644
--- a/aports/linux-nokia-rx51/config-nokia-rx51.armhf
+++ b/aports/linux-nokia-rx51/config-nokia-rx51.armhf
@@ -108,7 +108,7 @@ CONFIG_RCU_STALL_COMMON=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_GENERIC_SCHED_CLOCK=y
@@ -556,7 +556,7 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
-CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw mtdoops.mtddev=log console=tty0 console=ttyO2 omapfb_vram=7M omapfb.mode=lcd:848x480-16 nokia-modem.pm=0"
+CONFIG_CMDLINE="init=/init console=tty0 console=ttyO2 omapfb_vram=7M omapfb.mode=lcd:848x480-16"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
@@ -1388,10 +1388,10 @@ CONFIG_MD=y
 # CONFIG_BLK_DEV_MD is not set
 # CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_MQ_DEFAULT is not set
 # CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=m
+CONFIG_DM_CRYPT=y
 # CONFIG_DM_SNAPSHOT is not set
 # CONFIG_DM_THIN_PROVISIONING is not set
 # CONFIG_DM_CACHE is not set
@@ -2573,18 +2573,18 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SIMPLE is not set
 CONFIG_OMAP2_VRFB=y
 CONFIG_FB_OMAP2=y
-# CONFIG_FB_OMAP2_DEBUG_SUPPORT is not set
+CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
 CONFIG_FB_OMAP2_NUM_FBS=3
 CONFIG_FB_OMAP2_DSS_INIT=y
 CONFIG_FB_OMAP2_DSS=y
-# CONFIG_FB_OMAP2_DSS_DEBUG is not set
+CONFIG_FB_OMAP2_DSS_DEBUG=y
 # CONFIG_FB_OMAP2_DSS_DEBUGFS is not set
-# CONFIG_FB_OMAP2_DSS_DPI is not set
+CONFIG_FB_OMAP2_DSS_DPI=y
 CONFIG_FB_OMAP2_DSS_VENC=y
 # CONFIG_FB_OMAP4_DSS_HDMI is not set
 # CONFIG_FB_OMAP5_DSS_HDMI is not set
 CONFIG_FB_OMAP2_DSS_SDI=y
-# CONFIG_FB_OMAP2_DSS_DSI is not set
+CONFIG_FB_OMAP2_DSS_DSI=y
 CONFIG_FB_OMAP2_DSS_MIN_FCK_PER_PCK=0
 CONFIG_FB_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 
@@ -2619,9 +2619,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_PVR is not set
-# CONFIG_PVR_RELEASE is not set
-# CONFIG_PVR_DEBUG is not set
-# CONFIG_PVR_TIMING is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
@@ -2631,7 +2628,7 @@ CONFIG_HDMI=y
 #
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
@@ -4155,10 +4152,28 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_ARM_PTDUMP is not set
 CONFIG_ARM_UNWIND=y
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_OMAP2UART1 is not set
+CONFIG_DEBUG_OMAP2UART2=y
+# CONFIG_DEBUG_OMAP2UART3 is not set
+# CONFIG_DEBUG_OMAP3UART3 is not set
+# CONFIG_DEBUG_OMAP4UART3 is not set
+# CONFIG_DEBUG_OMAP3UART4 is not set
+# CONFIG_DEBUG_OMAP4UART4 is not set
+# CONFIG_DEBUG_TI81XXUART1 is not set
+# CONFIG_DEBUG_TI81XXUART2 is not set
+# CONFIG_DEBUG_TI81XXUART3 is not set
+# CONFIG_DEBUG_AM33XXUART1 is not set
+# CONFIG_DEBUG_ZOOM_UART is not set
+# CONFIG_DEBUG_ICEDCC is not set
+# CONFIG_DEBUG_SEMIHOSTING is not set
+# CONFIG_DEBUG_LL_UART_8250 is not set
+# CONFIG_DEBUG_LL_UART_PL01X is not set
+CONFIG_DEBUG_OMAP2PLUS_UART=y
+CONFIG_DEBUG_LL_INCLUDE="debug/omap2plus.S"
 # CONFIG_DEBUG_UART_8250 is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+CONFIG_EARLY_PRINTK=y
 # CONFIG_ARM_KPROBES_TEST is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
@@ -4196,7 +4211,7 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
@@ -4205,7 +4220,7 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=m
 CONFIG_CRYPTO_AKCIPHER2=y
 # CONFIG_CRYPTO_RSA is not set
-CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
@@ -4232,7 +4247,7 @@ CONFIG_CRYPTO_ECHAINIV=m
 #
 # Block modes
 #
-CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTR=m
 # CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_ECB=m