diff --git a/debian/changelog b/debian/changelog
index 4176554d..45207926 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ livecd-rootfs (2.525.38) UNRELEASED; urgency=medium
 
   * Support generating a .disk/info file via ubuntu-image from the passed-in
     datestamp parameter (using the $NOW environment variable). (LP: #1856684)
+  * Switch raspi2-hwe-18.04-edge to raspi2-hwe-18.04. (LP: #1859478)
 
  -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 22 Jan 2020 09:18:06 +0100
 
diff --git a/live-build/auto/config b/live-build/auto/config
index d258ee88..a056a875 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -889,7 +889,7 @@ case $ARCH in
 				;;
 			raspi3)
 				COMPONENTS='main restricted universe multiverse'
-				KERNEL_FLAVOURS=raspi2-hwe-18.04-edge
+				KERNEL_FLAVOURS=raspi2-hwe-18.04
 				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
 				BINARY_REMOVE_LINUX=false
 				;;