198 files changed, 1488 insertions, 442 deletions

diff --git a/Makefile b/Makefile
index a598ff5..cf41d4f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ install: test
 
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live-helper
-	cp -r examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
+	cp -r data examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
 
 	# Installing documentation
 	mkdir -p $(DESTDIR)/usr/share/doc/live-helper
@@ -91,15 +91,15 @@ uninstall:
 update:
 	set -e; for MANPAGE in manpages/*.de.* manpages/*.en.*; \
 	do \
-		sed -i	-e 's/2007\\-06\\-04/2007\\-06\\-11/' \
-			-e 's/04.06.2007/11.06.2007/' \
-			-e 's/1.0~a13/1.0~a14/' \
+		sed -i	-e 's/2007\\-06\\-11/2007\\-06\\-18/' \
+			-e 's/11.06.2007/18.06.2007/' \
+			-e 's/1.0~a14/1.0~a15/' \
 		$$MANPAGE; \
 	done
 
-	set -e; for SCRIPT in functions/common.sh examples/cron/etch.sh examples/cron/etch+beryl.sh; \
+	set -e; for SCRIPT in functions/*.sh examples/cron/*.sh; \
 	do \
-		sed -i -e 's/1.0~a13/1.0~a14/' $$SCRIPT; \
+		sed -i -e 's/1.0~a14/1.0~a15/' $$SCRIPT; \
 	done
 
 clean:
diff --git a/data/debian-cd/etch/alpha_businesscard_udeb_include b/data/debian-cd/etch/alpha_businesscard_udeb_include
new file mode 100644
index 0000000..eea4461
--- /dev/null
+++ b/data/debian-cd/etch/alpha_businesscard_udeb_include
@@ -0,0 +1,4 @@
+choose-mirror
+netcfg
+ethdetect
+fdisk-udeb
diff --git a/data/debian-cd/etch/alpha_netinst_udeb_include b/data/debian-cd/etch/alpha_netinst_udeb_include
new file mode 100644
index 0000000..70df4f6
--- /dev/null
+++ b/data/debian-cd/etch/alpha_netinst_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+fdisk-udeb
diff --git a/data/debian-cd/etch/alpha_udeb_include b/data/debian-cd/etch/alpha_udeb_include
new file mode 100644
index 0000000..70df4f6
--- /dev/null
+++ b/data/debian-cd/etch/alpha_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+fdisk-udeb
diff --git a/data/debian-cd/etch/amd64_businesscard_udeb_include b/data/debian-cd/etch/amd64_businesscard_udeb_include
new file mode 100644
index 0000000..bfc81f0
--- /dev/null
+++ b/data/debian-cd/etch/amd64_businesscard_udeb_include
@@ -0,0 +1,5 @@
+choose-mirror
+netcfg
+ethdetect
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/amd64_netinst_udeb_include b/data/debian-cd/etch/amd64_netinst_udeb_include
new file mode 100644
index 0000000..e5ed873
--- /dev/null
+++ b/data/debian-cd/etch/amd64_netinst_udeb_include
@@ -0,0 +1,4 @@
+netcfg
+ethdetect
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/amd64_udeb_include b/data/debian-cd/etch/amd64_udeb_include
new file mode 100644
index 0000000..e5ed873
--- /dev/null
+++ b/data/debian-cd/etch/amd64_udeb_include
@@ -0,0 +1,4 @@
+netcfg
+ethdetect
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/arm_businesscard_udeb_include b/data/debian-cd/etch/arm_businesscard_udeb_include
new file mode 100644
index 0000000..6326d6c
--- /dev/null
+++ b/data/debian-cd/etch/arm_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/arm_netinst_udeb_include b/data/debian-cd/etch/arm_netinst_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/arm_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/arm_udeb_include b/data/debian-cd/etch/arm_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/arm_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/exclude-udebs b/data/debian-cd/etch/exclude-udebs
new file mode 100644
index 0000000..3cb4923
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs
@@ -0,0 +1,118 @@
+# These udebs build the d-i cdrom initrd. As such, there is no reason
+# to keep another copy of them on the CD in udeb form.
+# 
+# This duplicates data found in the file build/pkg-lists/kernel, in d-i svn
+kernel-image-*
+# build/pkg-lists/base in d-i svn
+rootskel
+main-menu
+cdebconf-udeb
+udpkg
+anna
+di-utils-shell
+di-utils-reboot
+lowmemcheck
+# build/pkg-lists/cdrom/common, in d-i svn (also included in the
+# root+cd-drivers floppies)
+busybox-udeb
+installation-locale
+localechooser
+iso-3166-udeb
+hw-detect
+cdrom-detect
+cdrom-retriever
+load-cdrom
+cdrom-checker
+bogl-bterm-udeb
+di-utils-terminfo
+cdebconf-priority
+cdebconf-newt-udeb
+usb-discover
+preseed-common
+initrd-preseed
+file-preseed
+nano-udeb
+floppy-retriever
+libfribidi0-udeb
+# Already on the initrd, thanks to library reduction.
+libdebconfclient0-udeb
+libdebian-installer-extra4-udeb
+# These udebs are only useful in building the boot floppy image.
+busybox-floppy-udeb
+rootskel-bootfloppy
+# gtk stuff
+cdebconf-gtk-udeb
+fontconfig-udeb
+libatk1.0-udeb
+libcairo-directfb2-udeb
+libdirectfb-0.9-22-udeb
+libdirectfb-0.9-25-udeb
+libexpat1-udeb
+libfreetype6-udeb
+libglib2.0-udeb
+libgtk-directfb-2.0-0-udeb
+libgtk2-engines-udeb
+libpango1.0-udeb
+libpng12-0-udeb
+libsdl1.2debian-udeb
+mouse-modules-*
+ttf-*
+fbset-udeb
+# We're currently using busybox's own shell, and do not need this one.
+dash-udeb
+# Not currently used
+cdebootstrap-udeb
+hdparm-udeb
+laptop-detect-udeb
+# These dhcp clients are not the currently preferred one.
+dhcp3-client-udeb
+# This package is only useful in the d-i-demo.
+di-utils-exit-installer
+# No need for these loaders.
+download-installer
+load-floppy
+# Only useful in the hd-media initrd.
+iso-scan
+load-iso
+# We're using busybox's modutils these days.
+modutils-basic
+modutils-full
+# Nothing currently depends on this, and it seems not useful on its own.
+reiserfsprogs-udeb
+# reiser4 is not in the Debian kernel.
+mkreiser4-udeb
+reiser4progs-udeb
+# No longer used by parted.
+libreiserfs0.3-udeb
+# These are not really needed, the regular netcfg subsumes them.
+netcfg-static
+# skolelinux stuff, not for the stock CDs
+debian-edu-install-udeb
+debian-edu-profile-udeb
+debian-edu-archive-keyring-udeb
+ltsp-client-builder
+autopartkit
+lvm10-udeb
+# If needed, will be on the initrd already.
+modutils-full
+module-init-tools-udeb
+env-preseed
+rescue-check
+rootskel-gtk
+cdebconf-text-udeb
+brltty-udeb
+klibc-utils-udeb
+libklibc-udeb
+udev-udeb
+ai-choosers
+auto-install
+# Obsolete
+libslang1-utf8-udeb
+discover-udeb
+discover-data-udeb
+discover1-udeb
+discover1-data-udeb
+libdiscover1-udeb
+# Eh?
+gnumach-udeb
+# Exclude apt-setup components; they will be included 
diff --git a/data/debian-cd/etch/exclude-udebs-amd64 b/data/debian-cd/etch/exclude-udebs-amd64
new file mode 100644
index 0000000..c3d32fe
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs-amd64
@@ -0,0 +1,28 @@
+# These udebs are in the d-i cdrom initrd and the hd-media initrd. 
+# As such, there is no reason to keep another copy of them on the CD
+# in udeb form.
+isa-pnp-modules-*
+socket-modules-*
+console-keymaps-at
+console-keymaps-usb
+fat-modules-*
+cdrom-core-modules-*
+cdrom-modules-*
+ide-modules-*
+ide-core-modules-*
+input-modules-*
+fb-modules-*
+kbd-chooser
+usb-modules-*
+usb-storage-modules-*
+scsi-core-modules-*
+# Not needed with the 2.6 kernel on amd64.
+userdevfs
+# The speakup kernel modules are not useful unless the access images are
+# provided.
+*-speakup-di
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/etch/exclude-udebs-i386 b/data/debian-cd/etch/exclude-udebs-i386
new file mode 100644
index 0000000..05a376b
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs-i386
@@ -0,0 +1,28 @@
+# These udebs are in the d-i cdrom initrd and the cd-drivers+root floppies. 
+# As such, there is no reason to keep another copy of them on the CD
+# in udeb form.
+isa-pnp-modules-*
+socket-modules-*
+console-keymaps-at
+console-keymaps-usb
+floppy-modules-*
+cdrom-core-modules-*
+cdrom-modules-*
+ide-modules-*
+ide-core-modules-*
+input-modules-*
+fb-modules-*
+kbd-chooser
+usb-modules-*
+usb-storage-modules-*
+scsi-core-modules-*
+# Not needed with the 2.4 kernel on i386.
+userdevfs
+# The speakup kernel modules are not useful unless the access images are
+# provided.
+*-speakup-di
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/etch/exclude-udebs-powerpc b/data/debian-cd/etch/exclude-udebs-powerpc
new file mode 100644
index 0000000..5a7df81
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs-powerpc
@@ -0,0 +1,28 @@
+# These udebs build the d-i cdrom initrd. As such, there is no reason
+# to keep another copy of them on the CD in udeb form.
+#
+# This duplicates data found in the file build/pkg-lists/cdrom/powerpc,
+# in d-i Subversion.
+
+cdrom-core-modules-*
+console-keymaps-at
+console-keymaps-usb
+eject-udeb
+firewire-core-modules-*
+fs-common-modules-*
+ide-modules-*
+input-modules-*
+kbd-chooser
+scsi-common-modules-*
+scsi-core-modules-*
+scsi-modules-*
+socket-modules-*
+usb-modules-*
+usb-storage-modules-*
+# Not needed with the 2.4 kernel on powerpc.
+userdevfs
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/etch/exclude-udebs-s390 b/data/debian-cd/etch/exclude-udebs-s390
new file mode 100644
index 0000000..e075e4b
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs-s390
@@ -0,0 +1,3 @@
+# S/390 does not support loading udebs off the CD image,
+# so we can exclude all udebs from it
+*
diff --git a/data/debian-cd/etch/exclude-udebs-sparc b/data/debian-cd/etch/exclude-udebs-sparc
new file mode 100644
index 0000000..d11a81b
--- /dev/null
+++ b/data/debian-cd/etch/exclude-udebs-sparc
@@ -0,0 +1,5 @@
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/etch/hppa_businesscard_udeb_include b/data/debian-cd/etch/hppa_businesscard_udeb_include
new file mode 100644
index 0000000..6326d6c
--- /dev/null
+++ b/data/debian-cd/etch/hppa_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/hppa_netinst_udeb_include b/data/debian-cd/etch/hppa_netinst_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/hppa_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/hppa_udeb_include b/data/debian-cd/etch/hppa_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/hppa_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/i386_businesscard_udeb_include b/data/debian-cd/etch/i386_businesscard_udeb_include
new file mode 100644
index 0000000..ecce0bd
--- /dev/null
+++ b/data/debian-cd/etch/i386_businesscard_udeb_include
@@ -0,0 +1,6 @@
+choose-mirror
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/i386_netinst_udeb_include b/data/debian-cd/etch/i386_netinst_udeb_include
new file mode 100644
index 0000000..081a743
--- /dev/null
+++ b/data/debian-cd/etch/i386_netinst_udeb_include
@@ -0,0 +1,5 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/i386_udeb_include b/data/debian-cd/etch/i386_udeb_include
new file mode 100644
index 0000000..081a743
--- /dev/null
+++ b/data/debian-cd/etch/i386_udeb_include
@@ -0,0 +1,5 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/ia64_businesscard_udeb_include b/data/debian-cd/etch/ia64_businesscard_udeb_include
new file mode 100644
index 0000000..6326d6c
--- /dev/null
+++ b/data/debian-cd/etch/ia64_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/ia64_netinst_udeb_include b/data/debian-cd/etch/ia64_netinst_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/ia64_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/ia64_udeb_include b/data/debian-cd/etch/ia64_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/ia64_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/m68k_businesscard_udeb_include b/data/debian-cd/etch/m68k_businesscard_udeb_include
new file mode 100644
index 0000000..6326d6c
--- /dev/null
+++ b/data/debian-cd/etch/m68k_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/m68k_netinst_udeb_include b/data/debian-cd/etch/m68k_netinst_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/m68k_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/m68k_udeb_include b/data/debian-cd/etch/m68k_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/m68k_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mips_businesscard_udeb_include b/data/debian-cd/etch/mips_businesscard_udeb_include
new file mode 100644
index 0000000..6326d6c
--- /dev/null
+++ b/data/debian-cd/etch/mips_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mips_netinst_udeb_include b/data/debian-cd/etch/mips_netinst_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/mips_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mips_udeb_include b/data/debian-cd/etch/mips_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/mips_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mipsel_businesscard_udeb_include b/data/debian-cd/etch/mipsel_businesscard_udeb_include
new file mode 100644
index 0000000..6326d6c
--- /dev/null
+++ b/data/debian-cd/etch/mipsel_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mipsel_netinst_udeb_include b/data/debian-cd/etch/mipsel_netinst_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/mipsel_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/mipsel_udeb_include b/data/debian-cd/etch/mipsel_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/mipsel_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/powerpc_businesscard_udeb_include b/data/debian-cd/etch/powerpc_businesscard_udeb_include
new file mode 100644
index 0000000..b5c5e7e
--- /dev/null
+++ b/data/debian-cd/etch/powerpc_businesscard_udeb_include
@@ -0,0 +1,4 @@
+choose-mirror
+netcfg
+ethdetect
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/powerpc_netinst_udeb_include b/data/debian-cd/etch/powerpc_netinst_udeb_include
new file mode 100644
index 0000000..4a83dd2
--- /dev/null
+++ b/data/debian-cd/etch/powerpc_netinst_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/powerpc_udeb_include b/data/debian-cd/etch/powerpc_udeb_include
new file mode 100644
index 0000000..081a743
--- /dev/null
+++ b/data/debian-cd/etch/powerpc_udeb_include
@@ -0,0 +1,5 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
diff --git a/data/debian-cd/etch/s390_businesscard_udeb_include b/data/debian-cd/etch/s390_businesscard_udeb_include
new file mode 100644
index 0000000..6326d6c
--- /dev/null
+++ b/data/debian-cd/etch/s390_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/s390_netinst_udeb_include b/data/debian-cd/etch/s390_netinst_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/s390_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/s390_udeb_include b/data/debian-cd/etch/s390_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/s390_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/sparc_businesscard_udeb_include b/data/debian-cd/etch/sparc_businesscard_udeb_include
new file mode 100644
index 0000000..6326d6c
--- /dev/null
+++ b/data/debian-cd/etch/sparc_businesscard_udeb_include
@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/sparc_netinst_udeb_include b/data/debian-cd/etch/sparc_netinst_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/sparc_netinst_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/sparc_udeb_include b/data/debian-cd/etch/sparc_udeb_include
new file mode 100644
index 0000000..6f1c801
--- /dev/null
+++ b/data/debian-cd/etch/sparc_udeb_include
@@ -0,0 +1,2 @@
+netcfg
+ethdetect
diff --git a/data/debian-cd/etch/udeb_exclude b/data/debian-cd/etch/udeb_exclude
new file mode 100644
index 0000000..2e372f6
--- /dev/null
+++ b/data/debian-cd/etch/udeb_exclude
@@ -0,0 +1 @@
+apt-mirror-setup
diff --git a/includes/sid b/data/debian-cd/lenny
index 190cf35..190cf35 120000
--- a/includes/sid
+++ b/data/debian-cd/lenny
diff --git a/includes/stable b/data/debian-cd/sid
index 190cf35..190cf35 120000
--- a/includes/stable
+++ b/data/debian-cd/sid
diff --git a/debian/changelog b/debian/changelog
index 087f2ab..a52e615 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+live-helper (1.0~a15-1) unstable; urgency=medium
+
+  * New upstream release:
+    - corrected wrong project name in examples/sources/fai (Closes: #428360).
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 18 Jun 2007 00:00:00 +0200
+
 live-helper (1.0~a14-1) unstable; urgency=medium
 
   * New upstream release:
diff --git a/docs/CREDITS b/docs/CREDITS
index b641382..0397822 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -17,6 +17,7 @@ Patches (alphabetical order):
   * Richard Nelson <rjent@rjent.pair.com>
   * Scott Edwards <debian@foss.daxal.com>
   * Sebastian Raveau <sebastien.raveau@epita.fr>
+  * Thomas Lange <lange@informatik.uni-koeln.de>
   * Trent Buck <trentbuck@gmail.com>
 
 Donations (alphaetical order):
@@ -32,6 +33,9 @@ Special thanks (alphabetical order):
   * Sebastian Raveau <sebastien.raveau@epita.fr> for his work on encryption
     support.
   * Scott Edwards <debian@foss.daxal.com> for his work on d-i/g-i integration.
+  * Michael Dorrington <mike@zen.co.uk> for distracting Luk Claes on DebConf 7,
+    so that Luk couldn't disturb me all the time and I could finally do some
+    work.
 
 ...and countless other people showed up on the #debian-live IRC channel since
 February 2006: thanks for all your help, ideas, and wishes.
diff --git a/docs/ChangeLog b/docs/ChangeLog
index fe894c3..6abb430 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,24 @@
+2007-06-16  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_bootstrap_clone, lh_bootstrap_copy:
+	  - Added.
+	* helpers/lh_binary_live-installer:
+	  - Added.
+	* Uploaded 1.0~a15-1.
+
+2007-06-10  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/*:
+	  - Excluding lenny from the syslinux workarounds as syslinux 3.36 did
+	    migrate into testing.
+	* helpers/lh_bootstrap_cache, lh_chroot_cache:
+	  - Fixed typos which made caching fail on rebuilds.
+	* helpers/lh_clean:
+	  - Added unmount of binfmt on clean.
+	* helpers/lh_binary_usb-hdd:
+	  - Including script to write grub to the loop device from Thomas Lange
+	    <lange@informatik.uni-koeln.de>.
+
 2007-06-10  Daniel Baumann  <daniel@debian.org>
 
 	* helpers/lh_binary_grub, lh_binary_rootfs, lh_binary_yaboot,
diff --git a/docs/TODO b/docs/TODO
index c4e25e6..f728855 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -8,13 +8,18 @@ ALPHA series:
 
 FIXME
   * xfce flavours seem to be damaged again
-  * multi-kernel syslinux fuckup
-  * d-i/g-i pool generation on the media
+  * multi-kernel syslinux breakage
   * yaboot (powerpc) boot support
   * grub (i386/amd64) boot support on usb* binary images
   * grub (i386/amd64) boot support on net binary images
   * multi-{binary,architecture,distribution} builds in one shot
   * check unset variables
+  * include capability for package lists
+  * add descriptions in package lists
+  * signal handlers
+  * parsable descriptions in helpers
+  * add lilo support? :)
+  * set default live-entry to Live:, default install-entry to Install: in menu.lst.
 
 ADDME
   * vmlinu[xz] [ppc64?]
diff --git a/examples/cron/daily.sh b/examples/cron/daily.sh
index 30c1365..65150b5 100755
--- a/examples/cron/daily.sh
+++ b/examples/cron/daily.sh
@@ -82,7 +82,7 @@ do
 
 				# Moving logs
 				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+				mv "${TEMPDIR}"/debian-live/binary/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
 
 				# Creating images directory
 				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
diff --git a/examples/cron/etch+beryl.sh b/examples/cron/etch+beryl.sh
index 20445cd..b994e3b 100755
--- a/examples/cron/etch+beryl.sh
+++ b/examples/cron/etch+beryl.sh
@@ -7,7 +7,7 @@ BUILD="etch+beryl"
 # Begin custom defaults
 AUTOBUILD="enabled"
 
-DATE="r0_1.0~a14-1"
+DATE="r0_1.0~a15-1"
 DESTDIR="/srv/debian-unofficial/ftp/debian-live"
 TEMPDIR="/srv/tmp/live-helper"
 
@@ -91,7 +91,7 @@ do
 
 				# Moving logs
 				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+				mv "${TEMPDIR}"/debian-live/binary/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
 
 				# Creating images directory
 				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
diff --git a/examples/cron/etch.sh b/examples/cron/etch.sh
index 4b9c26d..19d076e 100755
--- a/examples/cron/etch.sh
+++ b/examples/cron/etch.sh
@@ -7,7 +7,7 @@ BUILD="etch"
 # Begin custom defaults
 AUTOBUILD="enabled"
 
-DATE="r0_1.0~a14-1"
+DATE="r0_1.0~a15-1"
 DESTDIR="/srv/debian-unofficial/ftp/debian-live"
 TEMPDIR="/srv/tmp/live-helper"
 
@@ -82,7 +82,7 @@ do
 
 				# Moving logs
 				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+				mv "${TEMPDIR}"/debian-live/binary/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
 
 				# Creating images directory
 				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
diff --git a/examples/cron/weekly.sh b/examples/cron/weekly.sh
index 54aa092..6f4003e 100755
--- a/examples/cron/weekly.sh
+++ b/examples/cron/weekly.sh
@@ -11,7 +11,7 @@ DATE="`date +%Y%m%d`"
 DESTDIR="/srv/debian-unofficial/ftp/debian-live"
 TEMPDIR="/srv/tmp/live-helper"
 
-OPTIONS="--binary-indices disabled --initramfs casper"
+OPTIONS="--binary-indices disabled --initramfs live-initramfs"
 
 ARCHITECTURES="`dpkg --print-architecture`"
 DISTRIBUTIONS="lenny"
@@ -82,7 +82,7 @@ do
 
 				# Moving logs
 				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+				mv "${TEMPDIR}"/debian-live/binary/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
 
 				# Creating images directory
 				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
@@ -96,10 +96,10 @@ do
 			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
 			then
 				# Workaround of missing multi-binary support in live-helper
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
+				mv "${TEMPDIR}"/debian-live/binary/live "${TEMPDIR}"/debian-live/live.tmp
 				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
 				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
+				mv "${TEMPDIR}"/debian-live/live.tmp "${TEMPDIR}"/debian-live/binary/live
 				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
 				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
 
diff --git a/examples/sources/fai b/examples/sources/fai
index 7d2d7ec..762702d 100644
--- a/examples/sources/fai
+++ b/examples/sources/fai
@@ -4,6 +4,6 @@
 ## To enable it, copy this file to your config/chroot_sources directory, once
 ## as e.g. fai.bootstrap and once as fai.binary.
 
-# FAI - Fully Automated Install
+# FAI - Fully Automatic Installation
 deb http://www.informatik.uni-koeln.de/fai/download/ etch koeln
 deb-src http://www.informatik.uni-koeln.de/fai/download/ etch koeln
diff --git a/functions/common.sh b/functions/common.sh
index 5c25e29..71011bd 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
 set -e
 
 PROGRAM="`basename ${0}`"
-VERSION="1.0~a14"
+VERSION="1.0~a15"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 8179ec3..56dd5ae 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -411,7 +411,12 @@ Set_defaults ()
 	then
 		case "${LH_MODE}" in
 			debian)
-				LIVE_LINUX_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
+				LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6"
+
+				if [ "${LIVE_CHROOT_FILESYSTEM}" = "squashfs" ]
+				then
+					LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES} squashfs-modules-2.6"
+				fi
 				;;
 
 			ubuntu)
@@ -502,6 +507,9 @@ Set_defaults ()
 	# Setting debian-installer option
 	LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER:-disabled}"
 
+	# Setting live-installer option
+	LIVE_LIVE_INSTALLER="${LIVE_LIVE_INSTALLER:-disabled}"
+
 	# Setting encryption
 	# LIVE_ENCRYPTION
 
diff --git a/helpers/lh_binary b/helpers/lh_binary
index e710b33..39ba209 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -42,6 +42,7 @@ lh_binary_encryption ${*}
 # Prepare images
 lh_binary_linux-image ${*}
 lh_binary_debian-installer ${*}
+lh_binary_live-installer ${*}
 lh_binary_memtest ${*}
 lh_binary_grub ${*}
 lh_binary_syslinux ${*}
diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index 4c81a30..a62080c 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -63,7 +63,7 @@ ${LH_ROOT_COMMAND} rm -rf chroot/chroot
 ${LH_ROOT_COMMAND} rm -rf chroot.tmp
 
 # Copying new chroot
-${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
+${LH_ROOT_COMMAND} cp -al chroot chroot.tmp
 ${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
 
 if [ -n "${LH_ROOT_COMMAND}" ]
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index d04ec31..de15f1c 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -55,32 +55,26 @@ Create_lockfile .lock
 case "${LIVE_BINARY_IMAGES}" in
 	iso)
 		DESTDIR="binary/install"
-		DESTDIR_INSTALLER="cdrom"
+		DI="cdrom"
 		;;
 
 	net)
 		DESTDIR="tftpboot"
-		DESTDIR_INSTALLER="netboot"
+		DI="netboot"
 
 		Echo_error "Not supported yet (FIXME)"
 		exit 1
 		;;
 
 	tar|usb-hdd)
+		DESTDIR="binary/install"
+		DI="hd-media"
+
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
 		then
-			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-			then
-				DESTDIR="binary"
-			else
-				DESTDIR="binary/install"
-			fi
-		else
-			DESTDIR="binary/install"
+			DESTDIR="binary"
 		fi
-
-		DESTDIR_INSTALLER="hd-media"
 		;;
 esac
 
@@ -106,96 +100,71 @@ then
 	fi
 fi
 
-# Downloading debian-installer
-mkdir -p "${DESTDIR}"
+VMLINUZ_DI="vmlinuz"
+INITRD_DI="initrd.gz"
+DESTDIR_DI="${DESTDIR}"
+
+VMLINUZ_GI="gtk/vmlinuz"
+INITRD_GI="gtk/initrd.gz"
+DESTDIR_GI="${DESTDIR}/gtk"
 
 # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+if [ "${LIVE_DISTRIBUTION}" = "etch" ]
 then
 	if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
 	then
-		if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-		then
-			wget --no-clobber -O "${DESTDIR}"/vmlinuz.di "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
-			wget --no-clobber -O "${DESTDIR}"/initrddi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
-		else
-			wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
-			wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
-		fi
-	else
-		wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
-		wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+		VMLINUZ_DI="vmlinuz.di"
+		INITRD_DI="initrddi.gz"
+		DESTDIR_DI="${DESTDIR}"
+
+		VMLINUZ_GI="vmlinuz.gi"
+		INITRD_GI="initrdgi.gz"
+		DESTDIR_GI="${DESTDIR}"
 	fi
-else
-	wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
-	wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
 fi
 
+# Downloading debian-installer
+mkdir -p "${DESTDIR_DI}"
+wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
+wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
+
 # Downloading graphical-installer
 if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
 then
-	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-	if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
-	then
-		if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
-		then
-			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-			then
-				wget --no-clobber -O "${DESTDIR}"/vmlinuz.gi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
-				wget --no-clobber -O "${DESTDIR}"/initrdgi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
-			else
-				mkdir -p "${DESTDIR}"/gtk
-
-				wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
-				wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
-			fi
-		else
-			mkdir -p "${DESTDIR}"/gtk
-
-			wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
-			wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
-		fi
-	else
-		mkdir -p "${DESTDIR}"/gtk
-
-		wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
-		wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
-	fi
+	mkdir -p "${DESTDIR_GI}"
+	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/vmlinuz
+	wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/initrd.gz
 fi
 
-FIXME ()
-{
-# Downloading udebs
-mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
-gunzip -c Packages.gz > Packages
-cd "${OLDPWD}"
+# Downloading additional packages
+mkdir -p chroot/binary.deb/archives/partial
+mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
+touch chroot/var/lib/dpkg/status
 
-for DISTRIBUTION in frozen stable testing unstable
-do
-	ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-done
+case "${LIVE_ARCHITECTURE}" in
+	amd64)
+		DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
+		;;
 
-DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
-UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
+	i386)
+		DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 lilo grub"
+		;;
 
-rm -f packages.di
+	powerpc)
+		DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
+		;;
+esac
 
-for UDEB in ${UDEBS}
-do
-	mkdir -p binary/`dirname ${UDEB}`
-	cd binary/`dirname ${UDEB}`
-	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
-	cd "${OLDPWD}"
-done
+Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
+mv chroot/binary.deb ./
+mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
 
-# Downloading debs
+# Including base debian packages
 if [ -d cache/packages_bootstrap ]
 then
-	for FILE in cache/packages_bootstrap/*.deb
+	for FILE in cache/packages_bootstrap/*.deb binary.deb/archives/*.deb
 	do
-		SOURCE="`dpkg -f ${FILE} Source`"
+		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
 
 		if [ -z "${SOURCE}" ]
 		then
@@ -220,85 +189,120 @@ then
 	done
 fi
 
+# Generating deb indices
 mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
 
+cd binary
+apt-ftparchive packages pool/main > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
+gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages.gz
+#apt-ftparchive sources pool/main > dists/${LIVE_DISTRIBUTION}/main/source/Sources
+#gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/source/Sources > dists/${LIVE_DISTRIBUTION}/main/source/Sources
+cd "${OLDPWD}"
+
+# Writing release
 cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
-Archive: ${LIVE_DISTRIBUTION}
+Archive: stable
+Version: 4.0r0
 Component: main
 Origin: Debian
 Label: Debian
 Architecture: ${LIVE_ARCHITECTURE}
 EOF
 
-mkdir -p cache/indices_debian-installer
-
-cat > cache/indices_debian-installer/archive << EOF
-Dir
-{
-	ArchiveDir	"binary";
-	// OverrideDir	"";
-	// CacheDir	"";
-	FileListDir	"cache/indices_debian-installer";
-};
-
-Default
-{
-	Packages::Compress	". gzip";
-	// Packages::Extension	".deb";
-	// Sources::Extensions	".dsc";
-	// Contents::Compress	"gzip";
-	// DeLinkLimit		"0";
-	// FileMode		"0644";
-};
-
-TreeDefault
-{
-	// MaxContentsChange
-	// ContentsAge
-	Directory		"dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/";
-	Packages		"dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
-	InternalPrefix		"dists/\$(DIST)/\$(SECTION)/";
-	Contents		"dists/\$(DIST)/Contents-\$(ARCH)";
-	// Contents::Header
-	// BinCacheDB		"cache.\$(DIST).\$(SECTION).\$(ARCH)";
-	// FileList		"filelist.\$(DIST).\$(SECTION).\$(ARCH)";
-	FileList		"filelist";
-	// BinOverride		"override.\$(DIST).\$(SECTION)";
-};
-
-tree "${LIVE_DISTRIBUTION}"
-{
-	Sections	"main";
-	Architectures	"${LIVE_ARCHITECTURE}";
-};
-EOF
+#cat > binary/dists/${LIVE_DISTRIBUTION}/main/source/Release << EOF
+#Archive: stable
+#Version: 4.0r0
+#Component: main
+#Origin: Debian
+#Label: Debian
+#Architecture: source
+#EOF
 
-cd binary
-find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist
+mkdir binary.udeb
+cd binary.udeb
+
+# Downloading udeb indices
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+gunzip -c Packages.gz > Packages
+
+# Sorting udebs
+UDEBS="`awk '/Filename: / { print $2 }' Packages`"
+
+# Downloading udebs
+DOWNLOAD=""
+for UDEB in ${UDEBS}
+do
+	DOWNLOAD="$DOWNLOAD ${LIVE_MIRROR_BOOTSTRAP}/${UDEB}"
+done
+echo $DOWNLOAD | xargs wget
+
+# Excluding udebs
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
+
+for EXCLUDE in `cat exclude`
+do
+	rm -f "${EXCLUDE}"_*.udeb
+done
+
+# Moving udebs
+for UDEB in ${UDEBS}
+do
+	if [ -f "`basename ${UDEB}`" ]
+	then
+		mkdir -p `dirname ${UDEB}`
+		mv "`basename ${UDEB}`" "`dirname ${UDEB}`"
+	fi
+done
+
+# Creating udeb indices
+mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages
+gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages.gz
+
+rm -f Packages* exclude
+find . | cpio -dmpu "${OLDPWD}"/binary
 cd "${OLDPWD}"
 
-cat > cache/indices_debian-installer/release << EOF
-APT::FTPArchive::Release::Origin	"Debian";
-APT::FTPArchive::Release::Label		"Debian";
-APT::FTPArchive::Release::Suite		"${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Version	"4.0";
-APT::FTPArchive::Release::Codename	"${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Date		"`date -R`";
-APT::FTPArchive::Release::Architectures	"${LIVE_ARCHITECTURE}";
-APT::FTPArchive::Release::Components	"main";
-EOF
+rm -rf binary.udeb
+rm -rf binary.deb
+
+# Generating release file
+apt-ftparchive \
+	-o APT::FTPArchive::Release::Origin="Debian" \
+	-o APT::FTPArchive::Release::Label="Debian" \
+	-o APT::FTPArchive::Release::Suite="${LIVE_DISTRIBUTION}" \
+	-o APT::FTPArchive::Release::Version="4.0" \
+	-o APT::FTPArchive::Release::Codename="${LIVE_DISTRIBUTION}" \
+	-o APT::FTPArchive::Release::Date="`date -R`" \
+	-o APT::FTPArchive::Release::Architectures="${LIVE_ARCHITECTURE}" \
+	-o APT::FTPArchive::Release::Components="main" \
+	-o APT::FTPArchive::Release::Description="Last updated: `date -R`" \
+release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
+
+# Creating dist symlinks
+for DISTRIBUTION in frozen stable testing unstable
+do
+	ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+done
 
-apt-ftparchive generate cache/indices_debian-installer/archive
-apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
-}
+ln -s . binary/debian
 
+# Creating disk info
 mkdir binary/.disk
 echo "main" > binary/.disk/base_components
 touch binary/.disk/base_installable
 echo "not_complete" > binary/.disk/cd_type
-#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info
-echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info
+echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} LIVE Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
 touch binary/.disk/mkisofs
+cat > binary/.disk/udeb_include << EOF
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
+EOF
 
 # Creating stage file
 Create_stagefile .stage/binary_debian-installer
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index db26ae9..dc22d7f 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -194,38 +194,22 @@ fi
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] || [ "${LIVE_LIVE_INSTALLER}" = "enabled" ]
 then
 	LINUX="title\t\tLive:\nroot\n\n${LINUX}"
 
 	LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
 
-	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-	then
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-	fi
-
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-
-	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-	then
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-	fi
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
 
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
 
-	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-	then
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-	fi
-
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-
-	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-	then
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-	fi
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
 fi
 
 # Assembling memtest configuration
@@ -246,7 +230,7 @@ case ${LIVE_BINARY_IMAGES} in
 		;;
 
 	tar|usb-hdd)
-		cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/stage2 binary/boot/grub
+		cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/e2fs_stage1_5 chroot/usr/lib/grub/*/stage2 binary/boot/grub
 		;;
 esac
 
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 7979dfe..0841f40 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -92,7 +92,7 @@ then
 		CP_OPTIONS="-L"
 	fi
 
-	# Copying d-i templates
+	# Copying install templates
 	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
 	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
 	then
@@ -105,7 +105,7 @@ then
 		cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
 	fi
 
-	# Adjusting d-i templates
+	# Adjusting install templates
 	DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
 	DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
 
@@ -122,5 +122,18 @@ then
 	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
 fi
 
+# Copying live templates
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* &> /dev/null
+then
+	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* binary
+fi
+
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}" ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* &> /dev/null
+then
+	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
+fi
+
 # Creating stage file
 Create_stagefile .stage/binary_includes
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 1b60024..e6c8ccc 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -92,38 +92,44 @@ fi
 mv binary chroot
 
 # Create image
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
-then
-	case "${LIVE_BOOTLOADER}" in
-		grub)
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
-
-			if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
-			then
-				GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
-			fi
-			;;
-
-		syslinux)
-			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
-
-			if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
-			then
-				GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
-			fi
-			;;
-
-		*)
-			Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
-			sleep 5
-			;;
-	esac
-
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-fi
-
-cat >> chroot/binary.sh << EOF
-${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary
+case "${LIVE_BOOTLOADER}" in
+	grub)
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito"
+
+		if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+		then
+			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
+		fi
+		;;
+
+	syslinux)
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
+
+		if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+		then
+			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
+		fi
+		;;
+
+	yaboot)
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} --iso-level 2 --netatalk -hfs -probe -map yaboot/hfs.map --chrp-boot -part -no-desktop -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
+
+		if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+		then
+			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m yaboot/hfs.map"
+		fi
+		;;
+
+	*)
+		Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
+		sleep 5
+		;;
+esac
+
+cat > chroot/binary.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes binary
 EOF
 
 Chroot "sh binary.sh"
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index 306590d..c6bb3f8 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -60,17 +60,12 @@ case "${LIVE_BINARY_IMAGES}" in
 		;;
 
 	tar|usb-hdd)
+		DESTDIR="binary/live"
+
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
 		then
-			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-			then
-				DESTDIR="binary"
-			else
-				DESTDIR="binary/live"
-			fi
-		else
-			DESTDIR="binary/live"
+			DESTDIR="binary"
 		fi
 		;;
 esac
@@ -84,14 +79,17 @@ then
 		case "${LIVE_ARCHITECTURE}" in
 			amd64)
 				DESTDIR="${DESTDIR}.amd"
+				LINUX="vmlinuz"
 				;;
 
 			i386)
 				DESTDIR="${DESTDIR}.386"
+				LINUX="vmlinuz"
 				;;
 
 			powerpc)
 				DESTDIR="${DESTDIR}.ppc"
+				LINUX="vmlinux"
 				;;
 		esac
 	fi
@@ -101,7 +99,7 @@ fi
 mkdir -p "${DESTDIR}"
 
 # Installing linux-image
-cp chroot/boot/vmlinuz* "${DESTDIR}"
+cp chroot/boot/"${LINUX}"* "${DESTDIR}"
 cp chroot/boot/initrd.img* "${DESTDIR}"
 
 # Creating stage file
diff --git a/helpers/lh_binary_live-installer b/helpers/lh_binary_live-installer
new file mode 100755
index 0000000..8517ceb
--- /dev/null
+++ b/helpers/lh_binary_live-installer
@@ -0,0 +1,333 @@
+#!/bin/sh
+
+# lh_binary_live-installer(1) - install live-installer into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+	. "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="install live-installer into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_LIVE_INSTALLER}" != "enabled" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin installing live-installer..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_live-installer
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR="binary/install"
+		DI="cdrom"
+		;;
+
+	net)
+		DESTDIR="tftpboot"
+		DI="netboot"
+
+		Echo_error "Not supported yet (FIXME)"
+		exit 1
+		;;
+
+	tar|usb-hdd)
+		DESTDIR="binary/install"
+		DI="hd-media"
+
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+		then
+			DESTDIR="binary"
+		fi
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR="${DESTDIR}.amd"
+				;;
+
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+
+			powerpc)
+				DESTDIR="${DESTDIR}.ppc"
+				;;
+		esac
+	fi
+fi
+
+VMLINUZ_DI="vmlinuz"
+INITRD_DI="initrd.gz"
+DESTDIR_DI="${DESTDIR}"
+
+VMLINUZ_GI="gtk/vmlinuz"
+INITRD_GI="gtk/initrd.gz"
+DESTDIR_GI="${DESTDIR}/gtk"
+
+# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+if [ "${LIVE_DISTRIBUTION}" = "etch" ]
+then
+	if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
+	then
+		VMLINUZ_DI="vmlinuz.di"
+		INITRD_DI="initrddi.gz"
+		DESTDIR_DI="${DESTDIR}"
+
+		VMLINUZ_GI="vmlinuz.gi"
+		INITRD_GI="initrdgi.gz"
+		DESTDIR_GI="${DESTDIR}"
+	fi
+fi
+
+# Downloading debian-installer
+mkdir -p "${DESTDIR_DI}"
+wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
+wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
+
+# Downloading graphical-installer
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+then
+	mkdir -p "${DESTDIR_GI}"
+	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/vmlinuz
+	wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/initrd.gz
+fi
+
+# Downloading additional packages
+mkdir -p chroot/binary.deb/archives/partial
+mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
+touch chroot/var/lib/dpkg/status
+
+case "${LIVE_ARCHITECTURE}" in
+	amd64)
+		DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
+		;;
+
+	i386)
+		DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 lilo grub"
+		;;
+
+	powerpc)
+		DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
+		;;
+esac
+
+Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
+mv chroot/binary.deb ./
+mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+
+# Including base debian packages
+if [ -d cache/packages_bootstrap ]
+then
+	for FILE in cache/packages_bootstrap/*.deb binary.deb/archives/*.deb
+	do
+		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
+
+		if [ -z "${SOURCE}" ]
+		then
+			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+		fi
+
+		case "${SOURCE}" in
+			lib?*)
+				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+				;;
+
+			*)
+				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+				;;
+		esac
+
+		# Install directory
+		mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Move files
+		cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+	done
+fi
+
+# Generating deb indices
+mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
+
+cd binary
+apt-ftparchive packages pool/main > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
+gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages.gz
+#apt-ftparchive sources pool/main > dists/${LIVE_DISTRIBUTION}/main/source/Sources
+#gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/source/Sources > dists/${LIVE_DISTRIBUTION}/main/source/Sources
+cd "${OLDPWD}"
+
+# Fetching release
+wget http://"${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/binary-"${LIVE_ARCHITECTURE}"/Release -O binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release
+
+#cat > binary/dists/${LIVE_DISTRIBUTION}/main/source/Release << EOF
+#Archive: stable
+#Version: 4.0r0
+#Component: main
+#Origin: Debian
+#Label: Debian
+#Architecture: source
+#EOF
+
+mkdir binary.udeb
+cd binary.udeb
+
+# Downloading udeb indices
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+gunzip -c Packages.gz > Packages
+
+# Sorting udebs
+UDEBS="`awk '/Filename: / { print $2 }' Packages`"
+
+# Downloading udebs
+for UDEB in ${UDEBS}
+do
+	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+done
+
+# Including local udebs
+if ls ../config/binary_local-udebs/* &> /dev/null
+then
+	for FILE in ../config/binary_local-udebs/*.udeb
+	do
+		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
+
+		if [ -z "${SOURCE}" ]
+		then
+			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+		fi
+
+		case "${SOURCE}" in
+			lib?*)
+				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+				;;
+
+			*)
+				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+				;;
+		esac
+
+		# Install directory
+		mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Copy files
+		cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Prefere local udebs over downloaded udebs
+		rm -f "`basename ${FILE} | awk -F_ '{ print $1 }'`"_*.udeb
+	done
+fi
+
+# Excluding udebs
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/exclude-udebs-${LIVE_ARCHITECTURE} >> exclude
+
+for EXCLUDE in `cat exclude`
+do
+	rm -f "${EXCLUDE}"_*.udeb
+done
+
+# Moving udebs
+for UDEB in ${UDEBS}
+do
+	if [ -f "`basename ${UDEB}`" ]
+	then
+		mkdir -p `dirname ${UDEB}`
+		mv "`basename ${UDEB}`" "`dirname ${UDEB}`"
+	fi
+done
+
+# Creating udeb indices
+mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages
+gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages.gz
+
+rm -f Packages* exclude
+find . | cpio -dmpu "${OLDPWD}"/binary
+cd "${OLDPWD}"
+
+rm -rf binary.udeb
+rm -rf binary.deb
+
+# Generating release file
+apt-ftparchive \
+	-o APT::FTPArchive::Release::Origin="Debian" \
+	-o APT::FTPArchive::Release::Label="Debian" \
+	-o APT::FTPArchive::Release::Suite="${LIVE_DISTRIBUTION}" \
+	-o APT::FTPArchive::Release::Version="4.0" \
+	-o APT::FTPArchive::Release::Codename="${LIVE_DISTRIBUTION}" \
+	-o APT::FTPArchive::Release::Date="`date -R`" \
+	-o APT::FTPArchive::Release::Architectures="${LIVE_ARCHITECTURE}" \
+	-o APT::FTPArchive::Release::Components="main" \
+	-o APT::FTPArchive::Release::Description="Last updated: `date -R`" \
+release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
+
+# Creating dist symlinks
+for DISTRIBUTION in frozen stable testing unstable
+do
+	ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+done
+
+ln -s . binary/debian
+
+# Creating disk info
+mkdir binary/.disk
+echo "main" > binary/.disk/base_components
+touch binary/.disk/base_installable
+echo "not_complete" > binary/.disk/cd_type
+echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} LIVE Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+touch binary/.disk/mkisofs
+cat > binary/.disk/udeb_include << EOF
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
+live-installer
+EOF
+
+# Creating stage file
+Create_stagefile .stage/binary_debian-installer
diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest
index 0016f19..0ff6fa6 100755
--- a/helpers/lh_binary_manifest
+++ b/helpers/lh_binary_manifest
@@ -60,7 +60,7 @@ esac
 Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/${INITFS}/filesystem.manifest
 
 # Add packages.list
-Chroot "dpkg -l" > packages.txt
+Chroot "dpkg -l" > binary/packages.txt
 
 # Creating stage file
 Create_stagefile .stage/binary_manifest
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index 0ab2c4e..329f566 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -82,17 +82,12 @@ case "${LIVE_BINARY_IMAGES}" in
 		;;
 
 	tar|usb-hdd)
+		DESTDIR="binary/live"
+
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
 		then
-			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-			then
-				DESTDIR="binary"
-			else
-				DESTDIR="binary/live"
-			fi
-		else
-			DESTDIR="binary/live"
+			DESTDIR="binary"
 		fi
 		;;
 esac
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 455b1ab..f2a00f3 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -47,6 +47,16 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
+case "${LIVE_ARCHITECTURE}" in
+	amd64|i386)
+		LINUX="vmlinuz"
+		;;
+
+	powerpc)
+		LINUX="vmlinux"
+		;;
+esac
+
 case "${LH_INITRAMFS}" in
 	casper)
 		INITFS="casper"
@@ -60,6 +70,28 @@ esac
 # Creating directory
 mkdir -p binary/${INITFS}
 
+for STAGE in ${LH_CACHE_STAGES}
+do
+	if [ "${STAGE}" = "rootfs" ] && [ -d cache/stages_rootfs ]
+	then
+		# Removing old chroot
+		rm -rf binary/"${INITFS}"/filesystem.*
+
+		# Restoring old cache
+		mkdir -p binary/"${INITFS}"
+		${LH_ROOT_COMMAND} cp -a cache/stages_rootfs/filesystem.* binary/"${INITFS}"
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` binary
+		fi
+
+		# Creating stage file
+		Create_stagefile .stage/binary_rootfs
+		exit 0
+	fi
+done
+
 case "${LIVE_CHROOT_FILESYSTEM}" in
 	ext2)
 		# Checking depends
@@ -121,7 +153,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in
 
 		if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
 		then
-			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
 		fi
 
 		if [ -f config/binary_rootfs/squashfs.sort ]
@@ -147,5 +179,22 @@ case "${LIVE_CHROOT_FILESYSTEM}" in
 		;;
 esac
 
+for STAGE in ${LH_CACHE_STAGES}
+do
+	if [ "${STAGE}" = "rootfs" ]
+	then
+		rm -rf cache/stages_rootfs
+
+		mkdir -p cache/stages_rootfs
+
+		${LH_ROOT_COMMAND} cp -a binary/"${INITFS}"/filesystem.* cache/stages_rootfs
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_rootfs
+		fi
+	fi
+done
+
 # Creating stage file
 Create_stagefile .stage/binary_rootfs
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 977796d..d736d5f 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -104,14 +104,14 @@ case "${LIVE_BINARY_IMAGES}" in
 	;;
 
 	tar|usb-hdd)
+		DESTDIR_LIVE="binary/live"
+		DESTDIR_INSTALL="binary/install"
+
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ]
 		then
 			DESTDIR_LIVE="binary"
 			DESTDIR_INSTALL="binary"
-		else
-			DESTDIR_LIVE="binary/live"
-			DESTDIR_INSTALL="binary/install"
 		fi
 		;;
 esac
@@ -233,10 +233,16 @@ fi
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] || [ "${LIVE_LIVE_INSTALLER}" = "enabled" ]
 then
+	VMLINUZ_DI="vmlinuz"
+	INITRD_DI="initrd.gz"
+
+	VMLINUZ_GI="gtk/vmlinuz"
+	INITRD_GI="gtk/initrd.gz"
+
 	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-	if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+	if [ "${LIVE_DISTRIBUTION}" = "etch" ]
 	then
 		if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
 		then
@@ -245,19 +251,7 @@ then
 
 			VMLINUZ_GI="vmlinuz.gi"
 			INITRD_GI="initrdgi.gz"
-		else
-			VMLINUZ_DI="vmlinuz"
-			INITRD_DI="initrd.gz"
-
-			VMLINUZ_GI="gtk/vmlinuz"
-			INITRD_GI="gtk/initrd.gz"
 		fi
-	else
-		VMLINUZ_DI="vmlinuz"
-		INITRD_DI="initrd.gz"
-
-		VMLINUZ_GI="gtk/vmlinuz"
-		INITRD_GI="gtk/initrd.gz"
 	fi
 
 	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
@@ -265,61 +259,29 @@ then
 	then
 		LIVE_LINUX_INSTALL="LABEL install\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
 		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
-
-		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-		then
-			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
-		fi
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
 
 		LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel ${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=${INITRD_DI} -- "
-
-		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-		then
-			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel ${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
-		fi
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel ${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
 
 		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} rescue/enable=true -- "
-
-		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-		then
-			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} rescue/enable=true -- "
-		fi
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} rescue/enable=true -- "
 
 		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel ${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=${INITRD_DI} -- "
-
-		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-		then
-			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel ${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
-		fi
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel ${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
 	else
 		LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
 		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-
-		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-		then
-			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
-		fi
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
 
 		LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-
-		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-		then
-			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
-		fi
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
 
 		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
-
-		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-		then
-			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
-		fi
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
 
 		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-
-		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-		then
-			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
-		fi
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
 	fi
 fi
 
@@ -451,7 +413,7 @@ case "${LIVE_BINARY_IMAGES}" in
 
 	tar|usb-hdd)
 		# Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
-		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ]
 		then
 			DESTDIR="binary"
 		else
@@ -491,7 +453,7 @@ case "${LIVE_BINARY_IMAGES}" in
 		rm -f "${DESTDIR}"/pxelinux.cfg
 
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ]
 		then
 			if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 			then
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 49f8e8e..a417238 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -79,7 +79,7 @@ fi
 # Everything which comes here needs to be cleaned up,
 DU_DIM="`du -ms binary | cut -f1`"
 REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 50`" # Just 2% more to be sure, need something more sophistcated here...
-dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
+dd if=/dev/zero of=chroot/binary.img bs=1024k count=${REAL_DIM}
 FREELO="`${LH_LOSETUP} -f`"
 if [ ! -b chroot/${FREELO} ]
 then
@@ -90,40 +90,59 @@ then
 fi
 
 echo "!!! The following error/warning messages can be ignored !!!"
-lh_losetup $FREELO binary.img 0
+lh_losetup $FREELO chroot/binary.img 0
 Chroot "parted -s ${FREELO} mklabel msdos" || true
 Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
 Chroot "parted -s ${FREELO} set 1 boot on" || true
 Chroot "parted -s ${FREELO} set 1 lba off" || true
 
-case "${LIVE_BOOTLOADER}" in
-	grub)
-		#echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
-#grub --batch --no-floppy --device-map=binary/boot/grub/device.map << EOF
-#setup --stage1=binary/boot/grub/stage1 --stage2=binary/boot/grub/stage2 --prefix=/boot/grub (hd0)
-#
-#quit
-#EOF
-		#rm -f binary/boot/grub/device.map
-
-		#Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
-		;;
-
-	syslinux)
-		cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
-		;;
-esac
+if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+then
+	cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
+fi
 
 ${LH_LOSETUP} -d ${FREELO}
 
 FREELO="`${LH_LOSETUP} -f`"
-lh_losetup $FREELO binary.img 1
+lh_losetup $FREELO chroot/binary.img 1
 Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
-mkdir -p binary.tmp
-${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
-cp -r binary/* binary.tmp
-${LH_ROOT_COMMAND} umount binary.tmp
-rmdir binary.tmp
+mkdir -p chroot/binary.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} chroot/binary.tmp
+cp -r binary/* chroot/binary.tmp
+
+FIXME()
+{
+if [ "${LIVE_BOOTLOADER}" = "grub" ]
+then
+
+cat > chroot/grub.sh << EOF
+cd binary.tmp
+grub --batch << EOM
+find /live/vmlinuz
+EOM
+EOF
+
+	rootpartition="`Chroot 'sh grub.sh' 2>/dev/null | grep -A 1 'find /live/vmlinuz' | grep -v 'find /live/vmlinuz'`"
+	usbdev="`echo $rootpartition | sed -e 's/,[[:digit:]]//'`"
+	echo "Root partition is $rootpartition, device is: $usbdev"
+
+	echo "WAITING..." && read
+
+#cat > chroot/grub.sh << EOF
+#grub --batch << EOM
+#root $rootpartition
+#setup $usbdev
+#EOM
+#EOF
+
+#Chroot "sh grub.sh"
+
+	rm -f chroot/grub.sh
+fi
+}
+
+${LH_ROOT_COMMAND} umount chroot/binary.tmp
+rmdir chroot/binary.tmp
 
 if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
 then
@@ -132,16 +151,6 @@ fi
 
 ${LH_LOSETUP} -d ${FREELO}
 
-#if [ "${LIVE_BOOTLOADER}" = "grub" ]
-#then
-#	FREELO="`${LH_LOSETUP} -f`"
-#	lh_losetup $FREELO binary.img 0
-
-#	dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
-#	dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
-
-#	${LH_LOSETUP} -d ${FREELO}
-#fi
 echo "!!! The above error/warning messages can be ignored !!!"
 
 if [ -n "${MAKEDEV}" ]
@@ -150,6 +159,8 @@ then
 	mv chroot/dev.tmp chroot/dev
 fi
 
+mv chroot/binary.img ./
+
 # Removing depends
 Remove_package
 
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index d368692..fea812e 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -54,7 +54,7 @@ Create_lockfile .lock
 if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
 then
 	Echo_warning "skipping binary_yaboot, foreign architecture."
-	exit 0
+	#exit 0 # REMOVE_ME
 fi
 
 # Check user templates
@@ -94,7 +94,8 @@ esac
 # Setting destination directory
 case "${LIVE_BINARY_IMAGES}" in
 	iso)
-		DESTDIR="binary/live"
+		DESTDIR_LIVE="binary/live"
+		DESTDIR_INSTALL="binary/install"
 		;;
 
 	net|tar|usb-hdd)
@@ -102,18 +103,23 @@ case "${LIVE_BINARY_IMAGES}" in
 	;;
 esac
 
-# Temporary check for broken yaboot
+# Temporary check for broken syslinux FIXME
 if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
 then
-	case "${LIVE_ARCHITECTURE}" in
-		powerpc)
-			DESTDIR="${DESTDIR}.ppc"
-			;;
-	esac
+	# Assembling multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			powerpc)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.ppc"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.ppc"
+				;;
+		esac
+	fi
 fi
 
 # Creating directory
-mkdir -p "${DESTDIR}"
+mkdir -p "${DESTDIR_LIVE}"
 
 # Setting boot parameters
 if [ -n "${LIVE_ENCRYPTION}" ]
@@ -147,7 +153,7 @@ then
 		live-initramfs)
 			if [ "${LIVE_HOSTNAME}" != "debian" ]
 			then
-				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
 			fi
 			;;
 	esac
@@ -155,70 +161,82 @@ fi
 
 LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
 
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal" # FIXME
+
 # Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+if [ "${LIVE_BINARY_IMAGES}" != "net" ]
 then
 	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
+	LINUX="image=/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinux-//'`\n\tlabel=live\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
 else
 	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="image=`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
+	LINUX="image=`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinux-//'`\n\tlabel=live\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
 fi
 
 # FIXME
 if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 then
-	for KERNEL in chroot/boot/vmlinuz*
+	for KERNEL in chroot/boot/vmlinux*
 	do
 		if [ -z "${LINUX}" ]
 		then
 			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
 		then
-				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n  kernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
 			else
-				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
 		fi
 		else
 			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
 			then
-				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n  kernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
 			else
-				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinux-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinux-//'` boot=${INITFS} LIVE_BOOTAPPEND"
 			fi
 		fi
 	done
 fi
 
+# Removing '//'
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ] || [ "${LIVE_LIVE_INSTALLER}" = "enabled" ]
+then
+	VMLINUZ_DI="vmlinuz"
+	INITRD_DI="initrd.gz"
+
+	VMLINUZ_GI="gtk/vmlinuz"
+	INITRD_GI="gtk/initrd.gz"
+
+	LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+
+	LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
+
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+fi
+
+LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+
 case "${LIVE_BINARY_IMAGES}" in
 	iso)
 		# Copying yaboot
-		mkdir -p binary/install
-		cp chroot/usr/lib/yaboot/yaboot binary/install
+		mkdir -p binary/yaboot
+		cp chroot/usr/lib/yaboot/yaboot binary/yaboot
 		cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot
 
 		# Configure yaboot templates
-		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/yaboot.conf
+		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" binary/yaboot/yaboot.conf
 		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf
 		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg
-
-		# Working arround yaboot 8.3 limitation
-		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-		then
-			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
-			do
-				NUMBER=$(($NUMBER + 1))
-
-				mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
-				mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
-				sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
-			done
-		else
-			mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz
-			mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img
-			sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
-		fi
 		;;
 esac
 
diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap
index 5e483ae..c16f10c 100755
--- a/helpers/lh_bootstrap
+++ b/helpers/lh_bootstrap
@@ -34,6 +34,7 @@ Set_defaults
 
 # Bootstrapping system
 lh_bootstrap_cache restore ${*}
+lh_bootstrap_copy ${*}
 lh_bootstrap_cdebootstrap ${*}
 lh_bootstrap_debootstrap ${*}
 lh_bootstrap_cache save ${*}
diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache
index 6d79e09..03ae904 100755
--- a/helpers/lh_bootstrap_cache
+++ b/helpers/lh_bootstrap_cache
@@ -49,8 +49,11 @@ do
 
 			if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ]
 			then
+				# Removing old chroot
+				rm -rf chroot
+
 				# Restoring old cache
-				${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot
+				${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
 
 				if [ -n "${LH_ROOT_COMMAND}" ]
 				then
diff --git a/helpers/lh_bootstrap_clone b/helpers/lh_bootstrap_clone
new file mode 100755
index 0000000..ce5f29f
--- /dev/null
+++ b/helpers/lh_bootstrap_clone
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# lh_bootstrap_clone(1) - bootstrap by cloning the host system
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+	. "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="bootstrap by cloning the host system"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LH_BOOTSTRAP}" != "clone" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin bootstrapping system..."
+
+# Ensure that a system is built as root
+lh_testroot
+
+# Checking stage file
+Check_stagefile .stage/bootstrap
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Read package selection
+dpkg --get-selections
+
+# Read debconf values
+> preseed
+
+# Creating stage file
+Create_stagefile .stage/bootstrap
diff --git a/helpers/lh_bootstrap_copy b/helpers/lh_bootstrap_copy
new file mode 100755
index 0000000..c1991fb
--- /dev/null
+++ b/helpers/lh_bootstrap_copy
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# lh_bootstrap_copy(1) - bootstrap by copying the host system
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+	. "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="bootstrap by copying the host system"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LH_BOOTSTRAP}" != "copy" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin bootstrapping system..."
+
+# Ensure that a system is built as root
+lh_testroot
+
+# Checking stage file
+Check_stagefile .stage/bootstrap
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Copying host system
+find / ! -name /proc ! -name /sys ! -name "`dirname ${PWD}`"  | xargs cp -a chroot
+
+# Creating stage file
+Create_stagefile .stage/bootstrap
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index cafabd3..b89c2c9 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -32,13 +32,13 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
-Echo_message "Configuring file /etc/apt/apt.conf"
-
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
 case "${1}" in
 	install)
+		Echo_message "Configuring file /etc/apt/apt.conf"
+
 		# Checking stage file
 		Check_stagefile .stage/chroot_apt
 
@@ -111,6 +111,8 @@ case "${1}" in
 		;;
 
 	remove)
+		Echo_message "Deconfiguring file /etc/apt/apt.conf"
+
 		# Checking lock file
 		Check_lockfile .lock
 
diff --git a/helpers/lh_chroot_cache b/helpers/lh_chroot_cache
index 8d3d962..2f016a6 100755
--- a/helpers/lh_chroot_cache
+++ b/helpers/lh_chroot_cache
@@ -49,8 +49,11 @@ do
 
 			if [ "${STAGE}" = "chroot" ] && [ -d cache/stages_chroot ]
 			then
+				# Removing old chroot
+				rm -rf chroot
+
 				# Restoring old cache
-				${LH_ROOT_COMMAND} cp -a cache/stages_chroot/* chroot
+				${LH_ROOT_COMMAND} cp -a cache/stages_chroot chroot
 
 				if [ -n "${LH_ROOT_COMMAND}" ]
 				then
diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot
index 4410227..3a193a6 100755
--- a/helpers/lh_chroot_debianchroot
+++ b/helpers/lh_chroot_debianchroot
@@ -32,13 +32,13 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
-Echo_message "Configuring file /etc/debian_chroot"
-
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
 case "${1}" in
 	install)
+		Echo_message "Configuring file /etc/debian_chroot"
+
 		# Checking stage file
 		Check_stagefile .stage/chroot_debianchroot
 
@@ -62,6 +62,8 @@ case "${1}" in
 		;;
 
 	remove)
+		Echo_message "Deconfiguring file /etc/debian_chroot"
+
 		# Checking lock file
 		Check_lockfile .lock
 
diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts
index 09ae098..9807433 100755
--- a/helpers/lh_chroot_hosts
+++ b/helpers/lh_chroot_hosts
@@ -32,13 +32,13 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
-Echo_message "Configuring file /etc/hosts"
-
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
 case "${1}" in
 	install)
+		Echo_message "Configuring file /etc/hosts"
+
 		# Checking stage file
 		Check_stagefile .stage/chroot_hosts
 
@@ -65,6 +65,8 @@ case "${1}" in
 		;;
 
 	remove)
+		Echo_message "Deconfiguring file /etc/hosts"
+
 		# Checking lock file
 		Check_lockfile .lock
 
diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index 218f248..0678134 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -32,13 +32,13 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
-Echo_message "Configuring file /etc/kernel-img.conf"
-
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
 case "${1}" in
 	install)
+		Echo_message "Configuring file /etc/kernel-img.conf"
+
 		# Checking stage file
 		Check_stagefile .stage/chroot_linux-image
 
@@ -90,6 +90,8 @@ EOF
 		;;
 
 	remove)
+		Echo_message "Deconfiguring file /etc/kernel-img.conf"
+
 		# Checking lock file
 		Check_lockfile .lock
 
diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv
index 031bdc2..5549ccb 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -32,13 +32,13 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
-Echo_message "Configuring file /etc/resolv.conf"
-
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
 case "${1}" in
 	install)
+		Echo_message "Configuring file /etc/resolv.conf"
+
 		# Checking stage file
 		Check_stagefile .stage/chroot_resolv
 
@@ -65,6 +65,8 @@ case "${1}" in
 		;;
 
 	remove)
+		Echo_message "Deconfiguring file /etc/resolv.conf"
+
 		# Checking lock file
 		Check_lockfile .lock
 
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index 341f2d6..b8c9371 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -32,13 +32,13 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
-Echo_message "Configuring file /etc/apt/sources.list"
-
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
 case "${1}" in
 	install)
+		Echo_message "Configuring file /etc/apt/sources.list"
+
 		# Checking stage file
 		Check_stagefile .stage/chroot_sources
 
@@ -202,6 +202,8 @@ case "${1}" in
 		;;
 
 	remove)
+		Echo_message "Deconfiguring file /etc/apt/sources.list"
+
 		# Checking lock file
 		Check_lockfile .lock
 
diff --git a/helpers/lh_chroot_sysvrc b/helpers/lh_chroot_sysvrc
index a2b2230..ed365b9 100755
--- a/helpers/lh_chroot_sysvrc
+++ b/helpers/lh_chroot_sysvrc
@@ -32,13 +32,13 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
-Echo_message "Configuring file /usr/sbin/policy-rc.d"
-
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
 case "${1}" in
 	install)
+		Echo_message "Configuring file /usr/sbin/policy-rc.d"
+
 		# Checking stage file
 		Check_stagefile .stage/chroot_sysvrc
 
@@ -71,6 +71,8 @@ EOF
 		;;
 
 	remove)
+		Echo_message "Deconfiguring file /usr/sbin/policy-rc.d"
+
 		# Checking lock file
 		Check_lockfile .lock
 
diff --git a/helpers/lh_clean b/helpers/lh_clean
index 84c60b8..bd22681 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -20,7 +20,7 @@ done
 # Setting static variables
 DESCRIPTION="clean up system build directories"
 HELP=""
-USAGE="${PROGRAM} [all|cache|chroot|binary|lock|purge|stage|source]"
+USAGE="${PROGRAM} [all|cache|chroot|binary|purge|stage|source]"
 
 Arguments "${@}"
 
@@ -32,11 +32,12 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
+rm -f .lock
+
 case "${1}" in
 	all)
 		"${0}" chroot
 		"${0}" binary
-		"${0}" lock
 		"${0}" stage
 		"${0}" source
 
@@ -53,6 +54,7 @@ case "${1}" in
 
 	chroot)
 		${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
+		${LH_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
 		${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
 		${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
 		${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
@@ -72,10 +74,11 @@ case "${1}" in
 		;;
 
 	binary)
+                ${LH_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true
+		rm -rf binary.tmp binary.deb binary.udeb
 		rm -f binary.iso
 		rm -f binary.img
 		rm -f binary*.tar.gz
-		rm -f packages.txt
 
 		rm -rf binary
 		rm -rf tftpboot
@@ -83,10 +86,6 @@ case "${1}" in
 		rm -f .stage/binary*
 		;;
 
-	lock)
-		rm -f .lock
-		;;
-
 	purge)
 		PURGE="true" "${0}" all
 		"${0}" cache
diff --git a/helpers/lh_config b/helpers/lh_config
index 551e5b1..ef5e423 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -292,6 +292,7 @@ EOF
 # Creating lh_binary_* configuration
 mkdir -p "${LIVE_ROOT}"/config/binary_grub
 mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
+mkdir -p "${LIVE_ROOT}"/config/binary_local-udebs
 mkdir -p "${LIVE_ROOT}"/config/binary_rootfs
 mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
 
@@ -318,6 +319,10 @@ LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
 # (Default: ${LIVE_DEBIAN_INSTALLER})
 LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
 
+# \$LIVE_LIVE_INSTALLER: set debian-installer + live-installer
+# (Default: ${LIVE_LIVE_INSTALLER})
+LIVE_LIVE_INSTALLER="${LIVE_LIVE_INSTALLER}"
+
 # \$LIVE_ENCRYPTION: set encrytion
 # (Default: empty)
 LIVE_ENCRYPTION="${LIVE_ENCRYPTION}"
diff --git a/helpers/make-live b/helpers/make-live
index 6681058..fee621e 100755
--- a/helpers/make-live
+++ b/helpers/make-live
@@ -79,7 +79,7 @@ Local_arguments ()
 				;;
 
 			--binary-indices)
-				LH_BINARY_INDICES="${2}"; shift 2
+				LIVE_BINARY_INDICES="${2}"; shift 2
 				;;
 
 			--apt-pdiffs)
@@ -369,7 +369,7 @@ Main ()
 	Local_arguments "${@}"
 
 	# Configuring (this is really shit!)
-	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
+	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
 
 	if [ "${LH_BREAKPOINTS}" = "enabled" ]
 	then
diff --git a/includes/unstable b/includes/etch
index 9a63c96..9a63c96 120000
--- a/includes/unstable
+++ b/includes/etch
diff --git a/includes/lenny b/includes/lenny
index 190cf35..9a63c96 120000
--- a/includes/lenny
+++ b/includes/lenny
@@ -1 +1 @@
-etch
\ No newline at end of file
+sid
\ No newline at end of file
diff --git a/includes/etch/install.386/install/README.sbm b/includes/sid/install.386/install/README.sbm
index 4087670..4087670 100644
--- a/includes/etch/install.386/install/README.sbm
+++ b/includes/sid/install.386/install/README.sbm
diff --git a/includes/etch/install.386/install/sbm.bin b/includes/sid/install.386/install/sbm.bin
index b6e2415..b6e2415 100644
--- a/includes/etch/install.386/install/sbm.bin
+++ b/includes/sid/install.386/install/sbm.bin
diff --git a/includes/etch/install.amd/install b/includes/sid/install.amd/install
index 7ba56c8..7ba56c8 120000
--- a/includes/etch/install.amd/install
+++ b/includes/sid/install.amd/install
diff --git a/includes/etch/install/README.html b/includes/sid/install/README.html
index 549a748..549a748 100644
--- a/includes/etch/install/README.html
+++ b/includes/sid/install/README.html
diff --git a/includes/etch/install/README.mirrors.html b/includes/sid/install/README.mirrors.html
index 24a9cdc..24a9cdc 100644
--- a/includes/etch/install/README.mirrors.html
+++ b/includes/sid/install/README.mirrors.html
diff --git a/includes/etch/install/README.mirrors.txt b/includes/sid/install/README.mirrors.txt
index 31bbf0d..31bbf0d 100644
--- a/includes/etch/install/README.mirrors.txt
+++ b/includes/sid/install/README.mirrors.txt
diff --git a/includes/etch/install/README.txt b/includes/sid/install/README.txt
index db1c7b2..db1c7b2 100644
--- a/includes/etch/install/README.txt
+++ b/includes/sid/install/README.txt
diff --git a/includes/etch/install/autorun.bat b/includes/sid/install/autorun.bat
index 4718afe..4718afe 100644
--- a/includes/etch/install/autorun.bat
+++ b/includes/sid/install/autorun.bat
diff --git a/includes/etch/install/autorun.inf b/includes/sid/install/autorun.inf
index 1b28f75..1b28f75 100644
--- a/includes/etch/install/autorun.inf
+++ b/includes/sid/install/autorun.inf
diff --git a/includes/etch/install/doc/00-INDEX b/includes/sid/install/doc/00-INDEX
index 041eaca..041eaca 100644
--- a/includes/etch/install/doc/00-INDEX
+++ b/includes/sid/install/doc/00-INDEX
diff --git a/includes/etch/install/doc/FAQ/debian-faq.en.html.tar.gz b/includes/sid/install/doc/FAQ/debian-faq.en.html.tar.gz
index 4deda61..4deda61 100644
--- a/includes/etch/install/doc/FAQ/debian-faq.en.html.tar.gz
+++ b/includes/sid/install/doc/FAQ/debian-faq.en.html.tar.gz
diff --git a/includes/etch/install/doc/FAQ/debian-faq.en.pdf.gz b/includes/sid/install/doc/FAQ/debian-faq.en.pdf.gz
index 265fe0f..265fe0f 100644
--- a/includes/etch/install/doc/FAQ/debian-faq.en.pdf.gz
+++ b/includes/sid/install/doc/FAQ/debian-faq.en.pdf.gz
diff --git a/includes/etch/install/doc/FAQ/debian-faq.en.ps.gz b/includes/sid/install/doc/FAQ/debian-faq.en.ps.gz
index da90480..da90480 100644
--- a/includes/etch/install/doc/FAQ/debian-faq.en.ps.gz
+++ b/includes/sid/install/doc/FAQ/debian-faq.en.ps.gz
diff --git a/includes/etch/install/doc/FAQ/debian-faq.en.txt.gz b/includes/sid/install/doc/FAQ/debian-faq.en.txt.gz
index 0543b2b..0543b2b 100644
--- a/includes/etch/install/doc/FAQ/debian-faq.en.txt.gz
+++ b/includes/sid/install/doc/FAQ/debian-faq.en.txt.gz
diff --git a/includes/etch/install/doc/FAQ/html/ch-basic_defs.en.html b/includes/sid/install/doc/FAQ/html/ch-basic_defs.en.html
index aac1358..aac1358 100644
--- a/includes/etch/install/doc/FAQ/html/ch-basic_defs.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-basic_defs.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-basic_defs.html b/includes/sid/install/doc/FAQ/html/ch-basic_defs.html
index 6bee626..6bee626 120000
--- a/includes/etch/install/doc/FAQ/html/ch-basic_defs.html
+++ b/includes/sid/install/doc/FAQ/html/ch-basic_defs.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-compat.en.html b/includes/sid/install/doc/FAQ/html/ch-compat.en.html
index 4e92270..4e92270 100644
--- a/includes/etch/install/doc/FAQ/html/ch-compat.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-compat.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-compat.html b/includes/sid/install/doc/FAQ/html/ch-compat.html
index 0696449..0696449 120000
--- a/includes/etch/install/doc/FAQ/html/ch-compat.html
+++ b/includes/sid/install/doc/FAQ/html/ch-compat.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-contributing.en.html b/includes/sid/install/doc/FAQ/html/ch-contributing.en.html
index ae790ba..ae790ba 100644
--- a/includes/etch/install/doc/FAQ/html/ch-contributing.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-contributing.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-contributing.html b/includes/sid/install/doc/FAQ/html/ch-contributing.html
index 4185524..4185524 120000
--- a/includes/etch/install/doc/FAQ/html/ch-contributing.html
+++ b/includes/sid/install/doc/FAQ/html/ch-contributing.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-customizing.en.html b/includes/sid/install/doc/FAQ/html/ch-customizing.en.html
index 0185e6c..0185e6c 100644
--- a/includes/etch/install/doc/FAQ/html/ch-customizing.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-customizing.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-customizing.html b/includes/sid/install/doc/FAQ/html/ch-customizing.html
index 1cfdfaa..1cfdfaa 120000
--- a/includes/etch/install/doc/FAQ/html/ch-customizing.html
+++ b/includes/sid/install/doc/FAQ/html/ch-customizing.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-faqinfo.en.html b/includes/sid/install/doc/FAQ/html/ch-faqinfo.en.html
index 1d4f43b..1d4f43b 100644
--- a/includes/etch/install/doc/FAQ/html/ch-faqinfo.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-faqinfo.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-faqinfo.html b/includes/sid/install/doc/FAQ/html/ch-faqinfo.html
index 0f759b4..0f759b4 120000
--- a/includes/etch/install/doc/FAQ/html/ch-faqinfo.html
+++ b/includes/sid/install/doc/FAQ/html/ch-faqinfo.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-ftparchives.en.html b/includes/sid/install/doc/FAQ/html/ch-ftparchives.en.html
index 6560f14..6560f14 100644
--- a/includes/etch/install/doc/FAQ/html/ch-ftparchives.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-ftparchives.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-ftparchives.html b/includes/sid/install/doc/FAQ/html/ch-ftparchives.html
index cdad69f..cdad69f 120000
--- a/includes/etch/install/doc/FAQ/html/ch-ftparchives.html
+++ b/includes/sid/install/doc/FAQ/html/ch-ftparchives.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-getting.en.html b/includes/sid/install/doc/FAQ/html/ch-getting.en.html
index fe19d08..fe19d08 100644
--- a/includes/etch/install/doc/FAQ/html/ch-getting.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-getting.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-getting.html b/includes/sid/install/doc/FAQ/html/ch-getting.html
index 568d808..568d808 120000
--- a/includes/etch/install/doc/FAQ/html/ch-getting.html
+++ b/includes/sid/install/doc/FAQ/html/ch-getting.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-kernel.en.html b/includes/sid/install/doc/FAQ/html/ch-kernel.en.html
index 28e150f..28e150f 100644
--- a/includes/etch/install/doc/FAQ/html/ch-kernel.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-kernel.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-kernel.html b/includes/sid/install/doc/FAQ/html/ch-kernel.html
index 125039f..125039f 120000
--- a/includes/etch/install/doc/FAQ/html/ch-kernel.html
+++ b/includes/sid/install/doc/FAQ/html/ch-kernel.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-nexttime.en.html b/includes/sid/install/doc/FAQ/html/ch-nexttime.en.html
index 2df0e3f..2df0e3f 100644
--- a/includes/etch/install/doc/FAQ/html/ch-nexttime.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-nexttime.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-nexttime.html b/includes/sid/install/doc/FAQ/html/ch-nexttime.html
index da23d48..da23d48 120000
--- a/includes/etch/install/doc/FAQ/html/ch-nexttime.html
+++ b/includes/sid/install/doc/FAQ/html/ch-nexttime.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-pkg_basics.en.html b/includes/sid/install/doc/FAQ/html/ch-pkg_basics.en.html
index a26e8ee..a26e8ee 100644
--- a/includes/etch/install/doc/FAQ/html/ch-pkg_basics.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-pkg_basics.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-pkg_basics.html b/includes/sid/install/doc/FAQ/html/ch-pkg_basics.html
index 98c97fe..98c97fe 120000
--- a/includes/etch/install/doc/FAQ/html/ch-pkg_basics.html
+++ b/includes/sid/install/doc/FAQ/html/ch-pkg_basics.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-pkgtools.en.html b/includes/sid/install/doc/FAQ/html/ch-pkgtools.en.html
index 2183ae9..2183ae9 100644
--- a/includes/etch/install/doc/FAQ/html/ch-pkgtools.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-pkgtools.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-pkgtools.html b/includes/sid/install/doc/FAQ/html/ch-pkgtools.html
index 6c9eeed..6c9eeed 120000
--- a/includes/etch/install/doc/FAQ/html/ch-pkgtools.html
+++ b/includes/sid/install/doc/FAQ/html/ch-pkgtools.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-redistrib.en.html b/includes/sid/install/doc/FAQ/html/ch-redistrib.en.html
index 8242553..8242553 100644
--- a/includes/etch/install/doc/FAQ/html/ch-redistrib.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-redistrib.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-redistrib.html b/includes/sid/install/doc/FAQ/html/ch-redistrib.html
index f182623..f182623 120000
--- a/includes/etch/install/doc/FAQ/html/ch-redistrib.html
+++ b/includes/sid/install/doc/FAQ/html/ch-redistrib.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-software.en.html b/includes/sid/install/doc/FAQ/html/ch-software.en.html
index afb823b..afb823b 100644
--- a/includes/etch/install/doc/FAQ/html/ch-software.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-software.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-software.html b/includes/sid/install/doc/FAQ/html/ch-software.html
index f75c0ab..f75c0ab 120000
--- a/includes/etch/install/doc/FAQ/html/ch-software.html
+++ b/includes/sid/install/doc/FAQ/html/ch-software.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-support.en.html b/includes/sid/install/doc/FAQ/html/ch-support.en.html
index f910fe7..f910fe7 100644
--- a/includes/etch/install/doc/FAQ/html/ch-support.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-support.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-support.html b/includes/sid/install/doc/FAQ/html/ch-support.html
index 978d556..978d556 120000
--- a/includes/etch/install/doc/FAQ/html/ch-support.html
+++ b/includes/sid/install/doc/FAQ/html/ch-support.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-uptodate.en.html b/includes/sid/install/doc/FAQ/html/ch-uptodate.en.html
index 180431b..180431b 100644
--- a/includes/etch/install/doc/FAQ/html/ch-uptodate.en.html
+++ b/includes/sid/install/doc/FAQ/html/ch-uptodate.en.html
diff --git a/includes/etch/install/doc/FAQ/html/ch-uptodate.html b/includes/sid/install/doc/FAQ/html/ch-uptodate.html
index 37f6852..37f6852 120000
--- a/includes/etch/install/doc/FAQ/html/ch-uptodate.html
+++ b/includes/sid/install/doc/FAQ/html/ch-uptodate.html
diff --git a/includes/etch/install/doc/FAQ/html/footnotes.en.html b/includes/sid/install/doc/FAQ/html/footnotes.en.html
index 37d57bb..37d57bb 100644
--- a/includes/etch/install/doc/FAQ/html/footnotes.en.html
+++ b/includes/sid/install/doc/FAQ/html/footnotes.en.html
diff --git a/includes/etch/install/doc/FAQ/html/footnotes.html b/includes/sid/install/doc/FAQ/html/footnotes.html
index c18fdfb..c18fdfb 120000
--- a/includes/etch/install/doc/FAQ/html/footnotes.html
+++ b/includes/sid/install/doc/FAQ/html/footnotes.html
diff --git a/includes/etch/install/doc/FAQ/html/index.en.html b/includes/sid/install/doc/FAQ/html/index.en.html
index 7adba8c..7adba8c 100644
--- a/includes/etch/install/doc/FAQ/html/index.en.html
+++ b/includes/sid/install/doc/FAQ/html/index.en.html
diff --git a/includes/etch/install/doc/FAQ/html/index.html b/includes/sid/install/doc/FAQ/html/index.html
index 0e85422..0e85422 120000
--- a/includes/etch/install/doc/FAQ/html/index.html
+++ b/includes/sid/install/doc/FAQ/html/index.html
diff --git a/includes/etch/install/doc/bug-log-access.txt b/includes/sid/install/doc/bug-log-access.txt
index c8fa75f..c8fa75f 100644
--- a/includes/etch/install/doc/bug-log-access.txt
+++ b/includes/sid/install/doc/bug-log-access.txt
diff --git a/includes/etch/install/doc/bug-log-mailserver.txt b/includes/sid/install/doc/bug-log-mailserver.txt
index aa28efc..aa28efc 100644
--- a/includes/etch/install/doc/bug-log-mailserver.txt
+++ b/includes/sid/install/doc/bug-log-mailserver.txt
diff --git a/includes/etch/install/doc/bug-mailserver-refcard.txt b/includes/sid/install/doc/bug-mailserver-refcard.txt
index b3ce545..b3ce545 100644
--- a/includes/etch/install/doc/bug-mailserver-refcard.txt
+++ b/includes/sid/install/doc/bug-mailserver-refcard.txt
diff --git a/includes/etch/install/doc/bug-maint-info.txt b/includes/sid/install/doc/bug-maint-info.txt
index de36df0..de36df0 100644
--- a/includes/etch/install/doc/bug-maint-info.txt
+++ b/includes/sid/install/doc/bug-maint-info.txt
diff --git a/includes/etch/install/doc/bug-maint-mailcontrol.txt b/includes/sid/install/doc/bug-maint-mailcontrol.txt
index 52f8474..52f8474 100644
--- a/includes/etch/install/doc/bug-maint-mailcontrol.txt
+++ b/includes/sid/install/doc/bug-maint-mailcontrol.txt
diff --git a/includes/etch/install/doc/bug-reporting.txt b/includes/sid/install/doc/bug-reporting.txt
index 8ea79c5..8ea79c5 100644
--- a/includes/etch/install/doc/bug-reporting.txt
+++ b/includes/sid/install/doc/bug-reporting.txt
diff --git a/includes/etch/install/doc/constitution.txt b/includes/sid/install/doc/constitution.txt
index 70eca90..70eca90 100644
--- a/includes/etch/install/doc/constitution.txt
+++ b/includes/sid/install/doc/constitution.txt
diff --git a/includes/etch/install/doc/debian-manifesto b/includes/sid/install/doc/debian-manifesto
index 9322c93..9322c93 100644
--- a/includes/etch/install/doc/debian-manifesto
+++ b/includes/sid/install/doc/debian-manifesto
diff --git a/includes/etch/install/doc/mailing-lists.txt b/includes/sid/install/doc/mailing-lists.txt
index 5d4a6ed..5d4a6ed 100644
--- a/includes/etch/install/doc/mailing-lists.txt
+++ b/includes/sid/install/doc/mailing-lists.txt
diff --git a/includes/etch/install/doc/social-contract.txt b/includes/sid/install/doc/social-contract.txt
index e0ddb27..e0ddb27 100644
--- a/includes/etch/install/doc/social-contract.txt
+++ b/includes/sid/install/doc/social-contract.txt
diff --git a/includes/etch/install/doc/source-unpack.txt b/includes/sid/install/doc/source-unpack.txt
index 151b733..151b733 100644
--- a/includes/etch/install/doc/source-unpack.txt
+++ b/includes/sid/install/doc/source-unpack.txt
diff --git a/includes/etch/install/pics/blue-lowerleft.png b/includes/sid/install/pics/blue-lowerleft.png
index 2a2245e..2a2245e 100644
--- a/includes/etch/install/pics/blue-lowerleft.png
+++ b/includes/sid/install/pics/blue-lowerleft.png
diff --git a/includes/etch/install/pics/blue-lowerright.png b/includes/sid/install/pics/blue-lowerright.png
index 7e66271..7e66271 100644
--- a/includes/etch/install/pics/blue-lowerright.png
+++ b/includes/sid/install/pics/blue-lowerright.png
diff --git a/includes/etch/install/pics/blue-upperleft.png b/includes/sid/install/pics/blue-upperleft.png
index a58d0ec..a58d0ec 100644
--- a/includes/etch/install/pics/blue-upperleft.png
+++ b/includes/sid/install/pics/blue-upperleft.png
diff --git a/includes/etch/install/pics/blue-upperright.png b/includes/sid/install/pics/blue-upperright.png
index 2f36849..2f36849 100644
--- a/includes/etch/install/pics/blue-upperright.png
+++ b/includes/sid/install/pics/blue-upperright.png
diff --git a/includes/etch/install/pics/debian.jpg b/includes/sid/install/pics/debian.jpg
index db62d7a..db62d7a 100644
--- a/includes/etch/install/pics/debian.jpg
+++ b/includes/sid/install/pics/debian.jpg
diff --git a/includes/etch/install/pics/logo-50.jpg b/includes/sid/install/pics/logo-50.jpg
index 542f0a4..542f0a4 100644
--- a/includes/etch/install/pics/logo-50.jpg
+++ b/includes/sid/install/pics/logo-50.jpg
diff --git a/includes/etch/install/pics/red-lowerleft.png b/includes/sid/install/pics/red-lowerleft.png
index caca9c5..caca9c5 100644
--- a/includes/etch/install/pics/red-lowerleft.png
+++ b/includes/sid/install/pics/red-lowerleft.png
diff --git a/includes/etch/install/pics/red-lowerright.png b/includes/sid/install/pics/red-lowerright.png
index c27056c..c27056c 100644
--- a/includes/etch/install/pics/red-lowerright.png
+++ b/includes/sid/install/pics/red-lowerright.png
diff --git a/includes/etch/install/pics/red-upperleft.png b/includes/sid/install/pics/red-upperleft.png
index c1e3301..c1e3301 100644
--- a/includes/etch/install/pics/red-upperleft.png
+++ b/includes/sid/install/pics/red-upperleft.png
diff --git a/includes/etch/install/pics/red-upperright.png b/includes/sid/install/pics/red-upperright.png
index 54d17ca..54d17ca 100644
--- a/includes/etch/install/pics/red-upperright.png
+++ b/includes/sid/install/pics/red-upperright.png
diff --git a/includes/etch/install/tools/README b/includes/sid/install/tools/README
index bc56f93..bc56f93 100644
--- a/includes/etch/install/tools/README
+++ b/includes/sid/install/tools/README
diff --git a/includes/etch/install/tools/diskio.zip b/includes/sid/install/tools/diskio.zip
index b30fa96..b30fa96 100644
--- a/includes/etch/install/tools/diskio.zip
+++ b/includes/sid/install/tools/diskio.zip
diff --git a/includes/etch/install/tools/fips20.zip b/includes/sid/install/tools/fips20.zip
index c4a64b6..c4a64b6 100644
--- a/includes/etch/install/tools/fips20.zip
+++ b/includes/sid/install/tools/fips20.zip
diff --git a/includes/etch/install/tools/gzip124.exe b/includes/sid/install/tools/gzip124.exe
index 1a8d137..1a8d137 100644
--- a/includes/etch/install/tools/gzip124.exe
+++ b/includes/sid/install/tools/gzip124.exe
diff --git a/includes/etch/install/tools/lodlin16.zip b/includes/sid/install/tools/lodlin16.zip
index 50ad313..50ad313 100644
--- a/includes/etch/install/tools/lodlin16.zip
+++ b/includes/sid/install/tools/lodlin16.zip
diff --git a/includes/etch/install/tools/md5sum-w32.zip b/includes/sid/install/tools/md5sum-w32.zip
index 982202b..982202b 100644
--- a/includes/etch/install/tools/md5sum-w32.zip
+++ b/includes/sid/install/tools/md5sum-w32.zip
diff --git a/includes/etch/install/tools/rawrite1.zip b/includes/sid/install/tools/rawrite1.zip
index abdc229..abdc229 100644
--- a/includes/etch/install/tools/rawrite1.zip
+++ b/includes/sid/install/tools/rawrite1.zip
diff --git a/includes/etch/install/tools/rawrite2.zip b/includes/sid/install/tools/rawrite2.zip
index aa33885..aa33885 100644
--- a/includes/etch/install/tools/rawrite2.zip
+++ b/includes/sid/install/tools/rawrite2.zip
diff --git a/includes/etch/install/tools/rwwrtwin.zip b/includes/sid/install/tools/rwwrtwin.zip
index 2c3fd11..2c3fd11 100644
--- a/includes/etch/install/tools/rwwrtwin.zip
+++ b/includes/sid/install/tools/rwwrtwin.zip
diff --git a/includes/etch/install/tools/src/md5sum-w32_1.1.dsc b/includes/sid/install/tools/src/md5sum-w32_1.1.dsc
index 44393f8..44393f8 100644
--- a/includes/etch/install/tools/src/md5sum-w32_1.1.dsc
+++ b/includes/sid/install/tools/src/md5sum-w32_1.1.dsc
diff --git a/includes/etch/install/tools/src/md5sum-w32_1.1.tar.gz b/includes/sid/install/tools/src/md5sum-w32_1.1.tar.gz
index bf42ec8..bf42ec8 100644
--- a/includes/etch/install/tools/src/md5sum-w32_1.1.tar.gz
+++ b/includes/sid/install/tools/src/md5sum-w32_1.1.tar.gz
diff --git a/includes/etch/install/tools/unz512x3.exe b/includes/sid/install/tools/unz512x3.exe
index e8b36c8..e8b36c8 100644
--- a/includes/etch/install/tools/unz512x3.exe
+++ b/includes/sid/install/tools/unz512x3.exe
diff --git a/includes/etch/live/boot-parameters.txt b/includes/sid/live/boot-parameters.txt
index 73e6717..ba856aa 100644
--- a/includes/etch/live/boot-parameters.txt
+++ b/includes/sid/live/boot-parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.87.6-1 on 2007-06-03.
+Updated for live-initramfs 1.90.1-1 on 2007-06-11.
 
 These options (can be combined) work from the ISOLINUX bootprompt:
 
diff --git a/includes/testing b/includes/testing
deleted file mode 120000
index fb5b653..0000000
--- a/includes/testing
+++ /dev/null
@@ -1 +0,0 @@
-lenny
\ No newline at end of file
diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1
index cce37c2..8238a33 100644
--- a/manpages/lh_binary.de.1
+++ b/manpages/lh_binary.de.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "11.06.2007" "1.0~a14" "live\-helper"
+.TH LH_BINARY 1 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1
index eff4901..52ae128 100644
--- a/manpages/lh_binary.en.1
+++ b/manpages/lh_binary.en.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH LH_BINARY 1 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_binary \- meta\-helper for lh_binary_*
diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1
index 41dd1b8..a262b37 100644
--- a/manpages/lh_bootstrap.de.1
+++ b/manpages/lh_bootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "11.06.2007" "1.0~a14" "live\-helper"
+.TH LH_BOOTSTRAP 1 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1
index 4fa0722..1e913ea 100644
--- a/manpages/lh_bootstrap.en.1
+++ b/manpages/lh_bootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH LH_BOOTSTRAP 1 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_bootstrap \- meta\-helper for lh_bootstrap_*
diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1
index 773d17e..8e2cdb9 100644
--- a/manpages/lh_bootstrap_cdebootstrap.de.1
+++ b/manpages/lh_bootstrap_cdebootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "11.06.2007" "1.0~a14" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1
index 4efaa98..7435d61 100644
--- a/manpages/lh_bootstrap_cdebootstrap.en.1
+++ b/manpages/lh_bootstrap_cdebootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1
index 3466de2..f79991e 100644
--- a/manpages/lh_bootstrap_debootstrap.de.1
+++ b/manpages/lh_bootstrap_debootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "11.06.2007" "1.0~a14" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1
index b2ba5cd..58163d9 100644
--- a/manpages/lh_bootstrap_debootstrap.en.1
+++ b/manpages/lh_bootstrap_debootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1
index ac6f4b9..015b410 100644
--- a/manpages/lh_build.de.1
+++ b/manpages/lh_build.de.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "11.06.2007" "1.0~a14" "live\-helper"
+.TH LH_BUILD 1 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_build \- erstellen eines Live-Systemes
diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1
index d34ecff..92d97ae 100644
--- a/manpages/lh_build.en.1
+++ b/manpages/lh_build.en.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH LH_BUILD 1 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_build \- building a live system
diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1
index 32fdd18..94d854d 100644
--- a/manpages/lh_chroot.de.1
+++ b/manpages/lh_chroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "11.06.2007" "1.0~a14" "live\-helper"
+.TH LH_CHROOT 1 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1
index 06ea3a8..b990684 100644
--- a/manpages/lh_chroot.en.1
+++ b/manpages/lh_chroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH LH_CHROOT 1 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_chroot \- meta\-helper for lh_chroot_*
diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1
index 3efebca..b65cc95 100644
--- a/manpages/lh_clean.de.1
+++ b/manpages/lh_clean.de.1
@@ -1,11 +1,11 @@
-.TH LH_CLEAN 1 "11.06.2007" "1.0~a14" "live\-helper"
+.TH LH_CLEAN 1 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_clean \- r\[:a]umt das Build-Verzeichnis auf
 
 .SH SYNOPSIS
 .B lh_clean [\fIlive\-helper\ Optionen\fR\|]
-.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
+.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
 
 .SH BESCHREIBUNG
 lh_clean ist ein live\-helper\-Program das daf\[:u]r verwantwortlich ist, nach dem Bauen eines Live-Systemes das Build-Verzeichnis aufzur\[:a]umen. Es entfernt das Build-Verzeichnis und auch alle anderen Dateien, inklusive den Stage-Dateien die von einem live\-helper-Programm hinterlassen worden ist.
@@ -13,15 +13,13 @@ lh_clean ist ein live\-helper\-Program das daf\[:u]r verwantwortlich ist, nach d
 .SH OPTIONEN
 Die folgenden Optionen werden von lh_clean unterst\[:u]tzt.
 .IP "\fBall\fR" 4
-entfernt chroot, binary, lock, stage und source. Das ist die Standardoperation.
+entfernt chroot, binary, stage und source. Das ist die Standardoperation.
 .IP "\fBcache\fR" 4
 entfernt alle cache-Verzeichnisse.
 .IP "\fBchroot\fR" 4
 entbindet und entfernt das chroot-Verzeichnis. Wenn ein Cache von bootstrap verf\[:u]gbar ist, wird chroot auf diese Stufe zur\[:u]ck gesetzt.
 .IP "\fBbinary\fR" 4
 entfernt alle Caches, Verzeichnisse und Stage-Dateien der Binary-Stufe.
-.IP "\fBlock\fR" 4
-entfernt alle lock-Dateien.
 .IP "\fBpurge\fR" 4
 entfernt alles (inlusive cache) ausser config.
 .IP "\fBstage\fR" 4
diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1
index 11e0097..76b49a6 100644
--- a/manpages/lh_clean.en.1
+++ b/manpages/lh_clean.en.1
@@ -1,11 +1,11 @@
-.TH LH_CLEAN 1 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH LH_CLEAN 1 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_clean \- clean up system build directories
 
 .SH SYNOPSIS
 .B lh_clean [\fIlive\-helper\ options\fR\|]
-.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
+.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
 
 .SH DESCRIPTION
 lh_clean is a live\-helper program that is responsible for cleaning up after a system is built. It removes the system build directories, and removes some other files including stage files, and any detritus left behind by other live\-helper commands.
@@ -13,15 +13,13 @@ lh_clean is a live\-helper program that is responsible for cleaning up after a s
 .SH OPTIONS
 The following command line options are supported by lh_clean.
 .IP "\fBall\fR" 4
-removes chroot, binary, lock, stage, and source. This is the default operation.
+removes chroot, binary, stage, and source. This is the default operation.
 .IP "\fBcache\fR" 4
 removes all cache directories.
 .IP "\fBchroot\fR" 4
 unmounts and removes the chroot directory. If bootstrap cache is available, the system is reset to bootstrap stage.
 .IP "\fBbinary\fR" 4
 removes all binary related caches, directories, and stages files.
-.IP "\fBlock\fR" 4
-removes all lock files.
 .IP "\fBpurge\fR" 4
 removes everything (including cache) but config.
 .IP "\fBstage\fR" 4
diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1
index 411029a..6f82807 100644
--- a/manpages/lh_source.de.1
+++ b/manpages/lh_source.de.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "11.06.2007" "1.0~a14" "live\-helper"
+.TH LH_SOURCE 1 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_source \- Meta\-Helper f\[:u]r lh_source_*
diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1
index 09635b6..6ff6aa4 100644
--- a/manpages/lh_source.en.1
+++ b/manpages/lh_source.en.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH LH_SOURCE 1 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_source \- meta\-helper for lh_source_*
diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1
index cadf094..409b6f7 100644
--- a/manpages/lh_testroot.de.1
+++ b/manpages/lh_testroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "11.06.2007" "1.0~a14" "live\-helper"
+.TH LH_TESTROOT 1 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_testroot \- stellt sicher dass das System als root gebaut wird
diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1
index 5df25b3..8349873 100644
--- a/manpages/lh_testroot.en.1
+++ b/manpages/lh_testroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH LH_TESTROOT 1 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 lh_testroot \- ensure that a system is built as root
diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7
index f30338e..b158346 100644
--- a/manpages/live-helper.de.7
+++ b/manpages/live-helper.de.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "11.06.2007" "1.0~a14" "live\-helper"
+.TH LIVE\-HELPER 7 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 live\-helper \- Debian Live Helper-Programme
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index db3af46..586ef22 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH LIVE\-HELPER 7 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 live\-helper \- Debian Live helper programs
diff --git a/manpages/make-live.de.1 b/manpages/make-live.de.1
index 8b8f500..9008d84 100644
--- a/manpages/make-live.de.1
+++ b/manpages/make-live.de.1
@@ -1,4 +1,4 @@
-.TH MAKE\-LIVE 1 "11.06.2007" "1.0~a14" "live\-helper"
+.TH MAKE\-LIVE 1 "18.06.2007" "1.0~a15" "live\-helper"
 
 .SH NAME
 make\-live \- erstellt ein Debian Live-System
diff --git a/manpages/make-live.en.1 b/manpages/make-live.en.1
index c7d9a39..fef2508 100644
--- a/manpages/make-live.en.1
+++ b/manpages/make-live.en.1
@@ -1,4 +1,4 @@
-.TH MAKE\-LIVE 1 "2007\-06\-11" "1.0~a14" "live\-helper"
+.TH MAKE\-LIVE 1 "2007\-06\-18" "1.0~a15" "live\-helper"
 
 .SH NAME
 make\-live \- build a Debian Live system
diff --git a/templates/yaboot/boot.msg b/templates/yaboot/boot.msg
index 9c25a9c..1413284 100644
--- a/templates/yaboot/boot.msg
+++ b/templates/yaboot/boot.msg
@@ -1,6 +1,6 @@
-Welcome to Debian GNU/Linux
+Welcome to Debian GNU/Linux!
 
-This is an Debian Live CDROM,
+This is a Debian Live CDROM,
 built on LIVE_DATE.
 
 The default option is 'live'.
@@ -9,10 +9,14 @@ If the system fails to boot at all (the typical
 symptom is a white screen which doesn't go away),
 use 'live video=ofonly'.
 
-Press the tab key for a list of options, or type
-'help' for help.
+The plain options are for the powerpc family of
+processors (from 601 to G4). The *64 options are for
+64bit powerpc processors, which include the IBM
+Power3, Power4, Power5, ... boxes, as well as the
+Apple G5 boxes. Press the tab key for a list of
+options, or type 'help' for help.
 
 ************************************
-If in doubt, just press Enter, and if that
-doesn't work, type 'live video=ofonly'.
+If in doubt, just press enter, and if that
+doesn't work, try 'live video=ofonly'.
 ************************************
diff --git a/templates/yaboot/hfs.map b/templates/yaboot/hfs.map
new file mode 100644
index 0000000..0d8b4cf
--- /dev/null
+++ b/templates/yaboot/hfs.map
@@ -0,0 +1,12 @@
+# ext.  xlate  creator  type    comment
+.hqx    Ascii  'BnHx'   'TEXT'  "BinHex file"
+.sit    Raw    'SIT!'   'SITD'  "StuffIT Expander"
+.mov    Raw    'TVOD'   'MooV'  "QuickTime Movie"
+.deb    Raw    'Debn'   'bina'  "Debian package"
+.bin    Raw    'ddsk'   'DDim'  "Floppy or ramdisk image"
+.img    Raw    'ddsk'   'DDim'  "Floppy or ramdisk image"
+.b      Raw    'UNIX'   'tbxi'  "bootstrap"
+yaboot  Raw    'UNIX'   'boot'  "bootstrap"
+vmlinux Raw    'UNIX'   'boot'  "bootstrap"
+.conf   Raw    'UNIX'   'conf'  "bootstrap"
+*       Ascii  '????'   '????'  "Text file"
diff --git a/templates/yaboot/ofboot.b b/templates/yaboot/ofboot.b
new file mode 100644
index 0000000..6aeb93d
--- /dev/null
+++ b/templates/yaboot/ofboot.b
@@ -0,0 +1,64 @@
+<CHRP-BOOT>
+<COMPATIBLE>
+MacRISC MacRISC3 MacRISC4
+</COMPATIBLE>
+<DESCRIPTION>
+GNU/Linux PPC bootloader
+</DESCRIPTION>
+<BOOT-SCRIPT>
+" screen" output
+load-base release-load-area
+boot cd:,\yaboot\yaboot
+</BOOT-SCRIPT>
+<OS-BADGE-ICONS>
+1010
+000000000000F8FEACF6000000000000
+0000000000F5FFFFFEFEF50000000000
+00000000002BFAFEFAFCF70000000000
+0000000000F65D5857812B0000000000
+0000000000F5350B2F88560000000000
+0000000000F6335708F8FE0000000000
+00000000005600F600F5FD8100000000
+00000000F9F8000000F5FAFFF8000000
+000000008100F5F50000F6FEFE000000
+000000F8F700F500F50000FCFFF70000
+00000088F70000F50000F5FCFF2B0000
+0000002F582A00F5000008ADE02C0000
+00090B0A35A62B0000002D3B350A0000
+000A0A0B0B3BF60000505E0B0A0B0A00
+002E350B0B2F87FAFCF45F0B2E090000
+00000007335FF82BF72B575907000000
+000000000000ACFFFF81000000000000
+000000000081FFFFFFFF810000000000
+0000000000FBFFFFFFFFAC0000000000
+000000000081DFDFDFFFFB0000000000
+000000000081DD5F83FFFD0000000000
+000000000081DDDF5EACFF0000000000
+0000000000FDF981F981FFFF00000000
+00000000FFACF9F9F981FFFFAC000000
+00000000FFF98181F9F981FFFF000000
+000000ACACF981F981F9F9FFFFAC0000
+000000FFACF9F981F9F981FFFFFB0000
+00000083DFFBF981F9F95EFFFFFC0000
+005F5F5FDDFFFBF9F9F983DDDD5F0000
+005F5F5F5FDD81F9F9E7DF5F5F5F5F00
+0083DD5F5F83FFFFFFFFDF5F835F0000
+000000FBDDDFACFBACFBDFDFFB000000
+000000000000FFFFFFFF000000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFFFF00000000
+00000000FFFFFFFFFFFFFFFFFF000000
+00000000FFFFFFFFFFFFFFFFFF000000
+000000FFFFFFFFFFFFFFFFFFFFFF0000
+000000FFFFFFFFFFFFFFFFFFFFFF0000
+000000FFFFFFFFFFFFFFFFFFFFFF0000
+00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
+00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00
+00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
+000000FFFFFFFFFFFFFFFFFFFF000000
+</OS-BADGE-ICONS>
+</CHRP-BOOT>
diff --git a/templates/yaboot/pegasos b/templates/yaboot/pegasos
new file mode 100644
index 0000000..7a8758a
--- /dev/null
+++ b/templates/yaboot/pegasos
@@ -0,0 +1,90 @@
+\ FORTH is identifed by a forth comment at first line
+\
+\ terminal control stuff
+\
+: TTY.CSI d# 27 EMIT ASCII [ EMIT ;
+: TTY.HOME    TTY.CSI ASCII H EMIT ;
+: TTY.CLR_EOS TTY.CSI ASCII J EMIT ;
+: TTY.HOME_CLR TTY.HOME TTY.CLR_EOS ;
+\
+\ boot menu stuff
+\
+: my-max-boot-num 4 ;
+: my-boot-default 1 ;
+: my-boot-delay d# 300 ; \ unit = 100 ms
+: my-print-menu ( -- )
+  TTY.HOME_CLR
+  ."  "                                    			cr
+  ." Welcome to Debian GNU/Linux!"				cr
+  ." "								cr
+  ." This is a Debian Live CDROM,"				cr
+  ." built on LIVE_DATE."					cr
+  ." "								cr
+  ." The default option is 'live'."				cr
+  ." "								cr
+  ." ************************************"			cr
+  ." If in doubt, just choose (1) 'live'"			cr
+  ." ************************************"			cr
+  ."  "								cr
+  ." 1: install"   						cr
+  ." 2: install"   						cr
+  ." 3: expert"   						cr
+  ." 4: rescue"   						cr
+  ." 5: return to OF prompt"					cr
+  ."  "								cr
+;
+: my-boot-case ( num -- )
+  ."  " cr
+  case
+    1 of " cd live/vmlinuz-chrp.initrd --" endof
+    2 of " cd install/powerpc/vmlinuz-chrp.initrd --" endof
+    3 of " cd install/powerpc/vmlinuz-chrp.initrd DEBCONF_PRIORITY=low --" endof
+    4 of " cd install/powerpc/vmlinuz-chrp.initrd rescue/enable=true --" endof
+    5 of " none" endof
+  endcase
+  $boot
+;
+: my-input-num ( wait-period max-boot-num default-num -- boot-num )
+  1 \ loop-inc = 1
+  3 pick 0 do
+    0d emit
+    ." press 1-"
+    ( wait-period max-boot-num default-num loop-inc )
+    2 pick ascii 0 + emit
+    dup 1 = if
+      ."  within "
+      3 pick i - d# 10 / .d
+      ."  seconds"
+    then
+    ."  (default: "
+    over ascii 0 + emit
+    ." ) :                   "
+    d# 100 ms
+    key? if
+       key
+       ( wait-period max-boot-num default-num loop-inc key )
+       dup 0d = if \ return pressed
+         drop leave
+       then
+
+       ascii 0 -
+       ( wait-period max-boot-num default-num loop-inc num )
+       dup 1 5 pick
+       ( wait-period max-boot-num default-num loop-inc num num 1 max-boot-num )
+       between if
+         rot drop swap leave
+       then
+
+       ( wait-period max-boot-num default-num loop-inc num )
+       2drop 0  \ loop-inc = 0
+    then
+  dup +loop
+  drop
+  ( wait-period max-boot-num boot-num )
+  nip nip
+;
+
+
+my-print-menu
+my-boot-delay my-max-boot-num my-boot-default my-input-num
+my-boot-case
diff --git a/templates/yaboot/yaboot.conf b/templates/yaboot/yaboot.conf
index 12a7dff..050028c 100644
--- a/templates/yaboot/yaboot.conf
+++ b/templates/yaboot/yaboot.conf
@@ -1,5 +1,5 @@
 default=live
-message=/install/boot.msg
+message=/live/boot.msg
 
 LIVE_LINUX_LIVE