diff --git a/debian/changelog b/debian/changelog
index e32a8c4d..f34294c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ debian-cd (3.1.22) UNRELEASED; urgency=medium
   [ David Kalnischkies ]
   * Provide hashes for uncompressed Translation-* again. Closes: #767253
 
+  [ John Paul Adrian Glaubitz ]
+  * Use compressed kernel image by default in boot-hppa.
+
  -- Steve McIntyre <93sam@debian.org>  Sat, 10 Feb 2018 00:26:46 +0000
 
 debian-cd (3.1.21) unstable; urgency=medium
diff --git a/tools/boot/buster/boot-hppa b/tools/boot/buster/boot-hppa
index cf19dc3e..7cb689df 100755
--- a/tools/boot/buster/boot-hppa
+++ b/tools/boot/buster/boot-hppa
@@ -50,14 +50,14 @@ else
 	$WGET -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME"
 fi
 	
-K32=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc)
-K64=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc64*)
+K32=$(basename "$DI_DIR"/cdrom/2.6/vmlinuz-*-parisc)
+K64=$(basename "$DI_DIR"/cdrom/2.6/vmlinuz-*-parisc64*)
 
 cp "$DI_DIR"/cdrom/2.6/$K32  "$CDDIR/install"/$K32
 cp "$DI_DIR"/cdrom/2.6/$K64  "$CDDIR/install"/$K64
 cp "$DI_DIR"/cdrom/2.6/initrd.gz "$CDDIR/install"
 
-add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinux initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
+add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinuz initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
 add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-kernel-32 install/$K32"
 add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-kernel-64 install/$K64"
 add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-bootloader install/iplboot"
diff --git a/tools/boot/jessie/boot-hppa b/tools/boot/jessie/boot-hppa
index cf4cda80..1057282a 100755
--- a/tools/boot/jessie/boot-hppa
+++ b/tools/boot/jessie/boot-hppa
@@ -47,8 +47,8 @@ else
 	$WGET -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME"
 fi
 	
-K32=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc)
-K64=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc64*)
+K32=$(basename "$DI_DIR"/cdrom/2.6/vmlinuz-*-parisc)
+K64=$(basename "$DI_DIR"/cdrom/2.6/vmlinuz-*-parisc64*)
 
 cp "$DI_DIR"/cdrom/2.6/$K32  "$CDROOT/install"/$K32
 cp "$DI_DIR"/cdrom/2.6/$K64  "$CDROOT/install"/$K64
@@ -56,7 +56,7 @@ cp "$DI_DIR"/cdrom/2.6/initrd.gz "$CDROOT/install"
 
 install_languages "$CDROOT"
 
-add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinux initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
+add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinuz initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
 add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-32 install/$K32"
 add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-64 install/$K64"
 add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-bootloader install/iplboot"
diff --git a/tools/boot/stretch/boot-hppa b/tools/boot/stretch/boot-hppa
index cf19dc3e..7cb689df 100755
--- a/tools/boot/stretch/boot-hppa
+++ b/tools/boot/stretch/boot-hppa
@@ -50,14 +50,14 @@ else
 	$WGET -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME"
 fi
 	
-K32=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc)
-K64=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc64*)
+K32=$(basename "$DI_DIR"/cdrom/2.6/vmlinuz-*-parisc)
+K64=$(basename "$DI_DIR"/cdrom/2.6/vmlinuz-*-parisc64*)
 
 cp "$DI_DIR"/cdrom/2.6/$K32  "$CDDIR/install"/$K32
 cp "$DI_DIR"/cdrom/2.6/$K64  "$CDDIR/install"/$K64
 cp "$DI_DIR"/cdrom/2.6/initrd.gz "$CDDIR/install"
 
-add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinux initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
+add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinuz initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
 add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-kernel-32 install/$K32"
 add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-kernel-64 install/$K64"
 add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-bootloader install/iplboot"