diff --git a/debian/changelog b/debian/changelog
index d123f41c..b764969a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.658) UNRELEASED; urgency=medium
+
+  * Remove some deprecated raspi2 special-casing, switch the main universal
+    raspi SUBARCH to use the raspi KERNEL_FLAVOUR now that the kernel packages
+    have been renamed.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 08 Apr 2020 10:03:21 +0200
+
 livecd-rootfs (2.657) focal; urgency=medium
 
   * server: networkd applies the first sorted matching network file, thus
diff --git a/live-build/auto/config b/live-build/auto/config
index 6302715a..8f619055 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -912,15 +912,9 @@ case $ARCH in
 	armhf|arm64)
 		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
 		case $SUBARCH in
-			raspi2)
-				COMPONENTS='main restricted universe multiverse'
-				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
-				BINARY_REMOVE_LINUX=false
-				;;
 			raspi)
 				# Generic Raspberry Pi images
 				COMPONENTS='main restricted universe multiverse'
-				KERNEL_FLAVOURS=raspi2
 				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
 				BINARY_REMOVE_LINUX=false
 				;;