diff --git a/debian/changelog b/debian/changelog
index e400c406..90364889 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ debian-cd (3.1.16) UNRELEASED; urgency=medium
   * Fix changelog date for 3.1.15. Closes: #751814
   * Fix up Gnome CD set installing xfce - logic in boot menu creation was
     broken. Closes: #756774
+  * Update kernel flavours for armhf to just use armmp and armmp-lpae
   * Add trivial initial (non-booting) support for arm64, by copying and
     extending armhf for now.
 
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index d113fe33..7759e4b1 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -194,8 +194,8 @@ linux-image-versatile
 initramfs-tools
 busybox
 flash-kernel
-linux-image-mx5
-linux-image-omap
+linux-image-armmp
+linux-image-armmp-lpae
 #endif
 
 #ifdef ARCH_arm64