diff --git a/debian/changelog b/debian/changelog
index fe155d3..057c8b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-build (1:20170829kali2) kali-dev; urgency=medium
+
+  * Replace "kirkwood" and "orion5x" armel flavors with "marvell".
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Mon, 18 Sep 2017 17:33:20 +0200
+
 live-build (1:20170829kali1) kali-dev; urgency=medium
 
   * Synchronize with Debian. Remaining changes:
diff --git a/functions/defaults.sh b/functions/defaults.sh
index dc60207..017b6da 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -413,7 +413,7 @@
 		armel)
 			# armel will have special images: one rootfs image and many additional kernel images.
 			# therefore we default to all available armel flavours
-			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-kirkwood orion5x}"
+			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-marvell}"
 			;;
 
 		armhf)