diff -Nru debian-installer-20080522ubuntu23/build/Makefile debian-installer-20080522ubuntu25/build/Makefile
--- debian-installer-20080522ubuntu23/build/Makefile	2008-10-22 22:03:29.000000000 +0100
+++ debian-installer-20080522ubuntu25/build/Makefile	2008-11-24 16:56:20.000000000 +0000
@@ -571,6 +571,9 @@
 	echo "deb copy:$(shell pwd)/ $(LOCALUDEBDIR)/"; \
 	if [ "$(MIRROR)x" != "x" ]; then \
 		echo "deb $(MIRROR) $(USE_UDEBS_FROM) $(UDEB_COMPONENTS)"; \
+		for suite in $(USE_UDEBS_FROM_EXTRA); do \
+			echo "deb $(MIRROR) $$suite $(UDEB_COMPONENTS)"; \
+		done; \
 	else \
 		grep '^deb[ \t]' $(SYSTEM_SOURCES_LIST) \
 		|grep -v '^deb[ \t]cdrom:' \
@@ -581,6 +584,18 @@
 		|sed "s,^deb file,deb copy," \
 		|perl -ne 'print unless $$seen{$$_}; $$seen{$$_}=1' ; \
 	fi) > $@
+	set -e; if [ "$(USE_UDEBS_FROM_EXTRA)" ]; then \
+		while read type uri rest; do \
+			echo "$$type $$uri $$rest"; \
+			if [ "$${rest% *}" = "$(USE_UDEBS_FROM)" ]; then \
+				for suite in $(USE_UDEBS_FROM_EXTRA); do \
+					echo "$$type $$uri $$suite $${rest#* }"; \
+				done; \
+			fi; \
+		done < $@ > $@.new; \
+		mv $@.new $@; \
+	fi
+	cat $@
 
 
 # Font generation.
diff -Nru /tmp/4xPCDWkkvi/debian-installer-20080522ubuntu23/build/config/amd64.cfg /tmp/SMfB2W7q8M/debian-installer-20080522ubuntu25/build/config/amd64.cfg
--- debian-installer-20080522ubuntu23/build/config/amd64.cfg	2008-10-10 13:39:40.000000000 +0100
+++ debian-installer-20080522ubuntu25/build/config/amd64.cfg	2008-11-24 17:00:23.000000000 +0000
@@ -1,7 +1,7 @@
 MEDIUM_SUPPORTED = cdrom netboot hd-media # netboot-gtk monolithic
 
 # The version of the kernel to use.
-KERNELVERSION = 2.6.27-7-generic
+KERNELVERSION = 2.6.27-10-generic
 KERNELMAJOR = 2.6
 KERNEL_FLAVOUR = di
 KERNELNAME = vmlinuz
diff -Nru /tmp/4xPCDWkkvi/debian-installer-20080522ubuntu23/build/config/common /tmp/SMfB2W7q8M/debian-installer-20080522ubuntu25/build/config/common
--- debian-installer-20080522ubuntu23/build/config/common	2008-10-16 19:38:26.000000000 +0100
+++ debian-installer-20080522ubuntu25/build/config/common	2008-11-24 16:25:47.000000000 +0000
@@ -48,6 +48,7 @@
 # to build debian-installer. By default this is set to 'unstable' for building
 # daily images. For official builds this is overruled in debian/rules.
 USE_UDEBS_FROM ?= intrepid
+USE_UDEBS_FROM_EXTRA ?= intrepid-security intrepid-updates intrepid-proposed
 
 # Archive components from which to fetch debian-installer modules.
 UDEB_COMPONENTS ?= main/debian-installer
diff -Nru /tmp/4xPCDWkkvi/debian-installer-20080522ubuntu23/build/config/i386.cfg /tmp/SMfB2W7q8M/debian-installer-20080522ubuntu25/build/config/i386.cfg
--- debian-installer-20080522ubuntu23/build/config/i386.cfg	2008-10-10 13:39:40.000000000 +0100
+++ debian-installer-20080522ubuntu25/build/config/i386.cfg	2008-11-24 17:00:23.000000000 +0000
@@ -1,7 +1,7 @@
 MEDIUM_SUPPORTED = cdrom netboot hd-media # netboot-gtk floppy monolithic
 
 # The version of the kernel to use.
-KERNELVERSION = 2.6.27-7-generic
+KERNELVERSION = 2.6.27-10-generic
 KERNELMAJOR = 2.6
 KERNEL_FLAVOUR = di
 KERNELNAME = vmlinuz
diff -Nru /tmp/4xPCDWkkvi/debian-installer-20080522ubuntu23/debian/changelog /tmp/SMfB2W7q8M/debian-installer-20080522ubuntu25/debian/changelog
--- debian-installer-20080522ubuntu23/debian/changelog	2008-10-26 00:17:50.000000000 +0100
+++ debian-installer-20080522ubuntu25/debian/changelog	2008-11-24 17:03:51.000000000 +0000
@@ -1,3 +1,18 @@
+debian-installer (20080522ubuntu25) intrepid-proposed; urgency=low
+
+  * Use udebs from intrepid-security, intrepid-proposed, and
+    intrepid-updates.
+  * Dump the generated sources.list.udeb to the build log.
+  * Move mainline architectures to 2.6.27-10 kernels.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 24 Nov 2008 17:03:46 +0000
+
+debian-installer (20080522ubuntu24) intrepid-proposed; urgency=low
+
+  * Move mainline architectures to 2.6.27-8 kernels.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 21 Nov 2008 23:05:42 +0000
+
 debian-installer (20080522ubuntu23) intrepid; urgency=low
 
   * Take /usr/share/localechooser/languagelist.data.gz into account when