diff -Nru flash-kernel-2.13ubuntu9/debian/changelog flash-kernel-2.13ubuntu10/debian/changelog
--- flash-kernel-2.13ubuntu9/debian/changelog	2009-08-29 05:44:22.000000000 -0400
+++ flash-kernel-2.13ubuntu10/debian/changelog	2009-09-15 13:14:08.000000000 -0400
@@ -1,3 +1,11 @@
+flash-kernel (2.13ubuntu10) karmic; urgency=low
+
+  * Change descriptions from Debian kernel/initramfs to Ubuntu kernel/initramfs
+  * Added support for dove (LP: #409238)
+  * Added imx51 to subarchitecture line in control file
+
+ -- Michael Casadevall <mcasadevall@ubuntu.com>  Wed, 02 Sep 2009 16:04:12 +0000
+
 flash-kernel (2.13ubuntu9) karmic; urgency=low
 
   * add video=mxcfb:1024x768@60 to default cmdline options for babbage boards
diff -Nru flash-kernel-2.13ubuntu9/debian/control flash-kernel-2.13ubuntu10/debian/control
--- flash-kernel-2.13ubuntu9/debian/control	2009-05-12 12:33:00.000000000 -0400
+++ flash-kernel-2.13ubuntu10/debian/control	2009-09-02 14:42:27.000000000 -0400
@@ -24,7 +24,7 @@
 Priority: standard
 XC-Package-Type: udeb
 Architecture: arm armel armeb
-XB-Subarchitecture: iop32x ixp4xx orion5x
+XB-Subarchitecture: dove imx51 iop32x ixp4xx orion5x
 Provides: bootable-system
 Depends: cdebconf-udeb, installed-base, di-utils (>= 1.68)
 XB-Installer-Menu-Item: 7300
diff -Nru flash-kernel-2.13ubuntu9/debian/flash-kernel-installer.isinstallable flash-kernel-2.13ubuntu10/debian/flash-kernel-installer.isinstallable
--- flash-kernel-2.13ubuntu9/debian/flash-kernel-installer.isinstallable	2009-03-31 05:16:53.000000000 -0400
+++ flash-kernel-2.13ubuntu10/debian/flash-kernel-installer.isinstallable	2009-09-02 14:42:27.000000000 -0400
@@ -2,6 +2,9 @@
 set -e
 
 case "`archdetect`" in
+	arm*/dove)
+		exit 0
+	;;
 	arm*/imx51)
 		exit 0
 	;;
diff -Nru flash-kernel-2.13ubuntu9/debian/flash-kernel-installer.postinst flash-kernel-2.13ubuntu10/debian/flash-kernel-installer.postinst
--- flash-kernel-2.13ubuntu9/debian/flash-kernel-installer.postinst	2009-08-29 05:42:06.000000000 -0400
+++ flash-kernel-2.13ubuntu10/debian/flash-kernel-installer.postinst	2009-09-15 10:53:44.000000000 -0400
@@ -23,7 +23,7 @@
 # Are we writing to flash or constructing an image on disk?
 write_to_flash() {
 	case "$machine" in
-		"Buffalo Linkstation Pro/Live" | "Buffalo/Revogear Kurobox Pro" | "GLAN Tank" | "HP Media Vault mv2120")
+		"Buffalo Linkstation Pro/Live" | "Buffalo/Revogear Kurobox Pro" | "GLAN Tank" | "HP Media Vault mv2120" | "Marvell DB-MV88F6781-BP Development Board")
 			return 1
 		;;
 		*)
@@ -152,6 +152,17 @@
 			fi
 		fi
 	;;
+	"Marvell DB-MV88F6781-BP Development Board")
+		in-target update-initramfs -u || true
+		if ! apt-install uboot-mkimage; then
+			error "apt-install uboot-mkimage failed"
+		fi
+
+		# Add the rootfs to the flash-kernel.conf file
+		rootfs=$(findfs /)
+		uuid="$(block-attr --uuid "$rootfs")"
+		echo "rootfs='root=UUID=$uuid'" > /target/etc/flash-kernel.conf
+	;;
 	"Linksys NSLU2")
 		if ! apt-install ixp4xx-firmware; then
 			# not fatal, firmware can be provided other ways
diff -Nru flash-kernel-2.13ubuntu9/flash-kernel flash-kernel-2.13ubuntu10/flash-kernel
--- flash-kernel-2.13ubuntu9/flash-kernel	2009-03-31 11:43:26.000000000 -0400
+++ flash-kernel-2.13ubuntu10/flash-kernel	2009-09-15 13:15:23.000000000 -0400
@@ -133,6 +133,7 @@
 		"Freescale MX51 Babbage Board")		exit 0 ;;
 		"GLAN Tank")				exit 0 ;;
 		"HP Media Vault mv2120")		exit 0 ;;
+		"Marvell DB-MV88F6781-BP Development Board") exit 0;;
 		"Linksys NSLU2")			exit 0 ;;
 		"QNAP TS-109/TS-209" | "QNAP TS-409")	exit 0 ;;
 		"Thecus N2100")				exit 0 ;;
@@ -144,8 +145,8 @@
 	kvers="$1"
 	kfile=/boot/vmlinuz-$kvers
 	ifile=/boot/initrd.img-$kvers
-	desc="Debian kernel $1"
-	idesc="Debian ramdisk $1"
+	desc="Ubuntu kernel $1"
+	idesc="Ubuntu ramdisk $1"
 else
 	if [ -e /vmlinuz ]; then
 		kfile=/vmlinuz
@@ -431,6 +432,53 @@
 		) > $imtd || error "failed."
 		echo "done." >&2
 	;;
+	"Marvell DB-MV88F6781-BP Development Board")
+		check_subarch "dove"
+		tmp=$(tempfile)
+		printf "Generating kernel u-boot image... " >&2
+		cat $kfile >> $tmp
+		mkimage -A arm -O linux -T kernel -C none -n "$desc" -a 0x00008000 \
+			-e 0x00008000 -d $tmp $tmp.uboot >&2 1>/dev/null
+		echo "done." >&2
+		if [ -e /boot/uImage ]; then
+			echo "Creating backup of /boot/uImage." >&2
+			mv /boot/uImage /boot/uImage.bak
+		fi
+		echo "Creating new /boot/uImage." >&2
+		mv $tmp.uboot /boot/uImage
+		rm -f $tmp
+		printf "Generating initrd u-boot image... " >&2
+		mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 \
+			-e 0x0 -n "$idesc" -d "$ifile" "$tmp.uboot" >&2 1>/dev/null
+		echo "done." >&2
+		if [ -e /boot/uInitrd ]; then
+			echo "Creating backup of /boot/uInitrd." >&2
+			mv /boot/uInitrd /boot/uInitrd.bak
+		fi
+		echo "Creating new /boot/uInitrd." >&2
+		mv "$tmp.uboot" /boot/uInitrd
+		rm -f "$tmp.uboot" 
+
+		echo "Generating new u-boot boot script..." >&2
+
+		# The UUID will come from the flash-kernel config file
+		cat >"$tmp.boot.script" <<EOF
+echo Starting Ubuntu...
+\${fs}load \${interface} \${device}:\${partition} 0x00200000 \${prefix}uImage
+\${fs}load \${interface} \${device}:\${partition} 0x01100000 \${prefix}uInitrd
+setenv bootargs console=ttyS0,115200 console=tty0 mem=512M $rootfs
+bootm 0x00200000 0x01100000
+EOF
+		mkimage -A arm -T script -C none -n "Ubuntu boot script" -d "$tmp.boot.script" "$tmp.boot.scr" >&2 1>/dev/null
+		echo "done." >&2
+		if [ -e /boot/boot.scr ]; then
+			echo "Creating a backup of /boot/boot.scr"
+			mv /boot/boot.scr /boot/boot.scr.bak
+		fi
+		echo "Creating new /boot/boot.scr..."
+		mv "$tmp.boot.scr" /boot/boot.scr
+		rm -f "$tmp.boot.script" "$tmp.boot.scr"
+	;;
 	"QNAP TS-109/TS-209" | "QNAP TS-409")
 		check_subarch "orion5x"
 		check_mtd