diff --git a/packages/tools/bcm2835-bootloader/build b/packages/tools/bcm2835-bootloader/build
index eadd6e7851..c62a9af61e 100755
--- a/packages/tools/bcm2835-bootloader/build
+++ b/packages/tools/bcm2835-bootloader/build
@@ -26,4 +26,4 @@ cd $PKG_BUILD/mkimage
 
 rm -rf ./kernel.img
 
-python ./imagetool-uncompressed.py $(kernel_path)/arch/arm/boot/Image
+python ./imagetool-uncompressed.py $(kernel_path)/arch/arm/boot/zImage
diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf
index 2813765fb9..a394cb3549 100644
--- a/projects/RPi/linux/linux.arm.conf
+++ b/projects/RPi/linux/linux.arm.conf
@@ -36,9 +36,11 @@ CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
 CONFIG_SWAP=y