172 files changed, 2738 insertions, 2169 deletions

diff --git a/Makefile b/Makefile
index c7c6c88..f9a15cc 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ install:
 
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live-helper
-	cp -r functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
+	cp -r examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
 
 	# Installing documentation
 	mkdir -p $(DESTDIR)/usr/share/doc/live-helper
diff --git a/contrib/grub-splash/COPYING b/contrib/grub-splash/COPYING
new file mode 100644
index 0000000..fdd69a9
--- /dev/null
+++ b/contrib/grub-splash/COPYING
@@ -0,0 +1,26 @@
+The grub splash for Debian Live was done by Daniel Baumann <daniel@debian.org>
+based on the original work of Mark Riedesel.
+
+The contribution of Daniel is hereby placed in the public domain (no rights
+reserved).
+
+---------------
+http://dugnet.com/klown/pics/klowner_debboot.png
+by Mark Riedesel, license same as open use logo
+
+To create klowner.rle:
+
+  1. convert klowner.png klowner.bmp
+  2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle
+
+     (FBFDFA is the color used for the inside of the "n" in Debian.)
+---------------
+
+Debian Open Use Logo License
+
+Copyright (c) 1999 Software in the Public Interest
+This logo or a modified version may be used by anyone to refer to the Debian
+project, but does not indicate endorsement by the project.
+
+Note: we would appreciate that you make the image a link to
+http://www.debian.org/ if you use it on a web page.
diff --git a/contrib/grub-splash/klowner.rle b/contrib/grub-splash/klowner.rle
new file mode 100644
index 0000000..126b6b2
--- /dev/null
+++ b/contrib/grub-splash/klowner.rle
diff --git a/contrib/grub-splash/klowner_debboot.png b/contrib/grub-splash/klowner_debboot.png
new file mode 100644
index 0000000..5ca51d8
--- /dev/null
+++ b/contrib/grub-splash/klowner_debboot.png
diff --git a/contrib/grub-splash/live.xpm.gz b/contrib/grub-splash/live.xpm.gz
new file mode 100644
index 0000000..ea1623b
--- /dev/null
+++ b/contrib/grub-splash/live.xpm.gz
diff --git a/contrib/grub-splash/live_debboot.png b/contrib/grub-splash/live_debboot.png
new file mode 100644
index 0000000..a246cfb
--- /dev/null
+++ b/contrib/grub-splash/live_debboot.png
diff --git a/contrib/syslinux-splash/COPYING b/contrib/syslinux-splash/COPYING
index b8b654a..e1376c2 100644
--- a/contrib/syslinux-splash/COPYING
+++ b/contrib/syslinux-splash/COPYING
@@ -1,6 +1,8 @@
-The splash for Debian Live was done by Daniel Baumann <daniel@debian.org> based
-on the original work of Mark Riedesel. The contribution of Daniel is hereby
-placed in the public domain (no rights reserved).
+The syslinux splash for Debian Live was done by Daniel Baumann
+<daniel@debian.org> based on the original work of Mark Riedesel.
+
+The contribution of Daniel is hereby placed in the public domain (no rights
+reserved).
 
 ---------------
 http://dugnet.com/klown/pics/klowner_debboot.png
diff --git a/debian/changelog b/debian/changelog
index 0782ee1..3912ed3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-helper (1.0~a6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 16 Apr 2007 00:00:00 +0200
+
 live-helper (1.0~a5-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/copyright b/debian/copyright
index 0b55587..cbd1182 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,12 +26,14 @@ License:
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL file.
 
-License (contrib/syslinux-splash/*, templates/syslinux/splash.rle):
+License (contrib/grub-splash/*, contrib/syslinux-splash/*,
+templates/syslinux/splash.rle, templates/grub/splash.xpm.gz):
 
 	The splash for Debian Live was done by Daniel Baumann
-	<daniel@debian.org> based on the original work of Mark Riedesel. The
-	contribution of Daniel is hereby placed in the public domain (no rights
-	reserved).
+	<daniel@debian.org> based on the original work of Mark Riedesel.
+
+	The contribution of Daniel is hereby placed in the public domain (no
+	rights reserved).
 
 	---------------
 	http://dugnet.com/klown/pics/klowner_debboot.png
diff --git a/doc/CREDITS b/doc/CREDITS
index f0bd7ef..120929c 100644
--- a/doc/CREDITS
+++ b/doc/CREDITS
@@ -29,3 +29,6 @@ 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.
+
+...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/doc/ChangeLog b/doc/ChangeLog
index 8412303..65b5094 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,74 @@
+2007-04-16  Daniel Baumann  <daniel@debian.org>
+
+	* functions/defaults.sh:
+	  - Using lsb_release, if existing, to set default mode to ubuntu on
+	    ubuntu systems.
+	  - Moved desktop task to the end, so that gdm doesn't take
+	    gnome-session as default.
+	* helpers/lh_chroot_hooks:
+	  - Added simple --hooks for easy testing.
+	* Uploaded 1.0~a6-1.
+
+2007-04-15  Daniel Baumann  <daniel@debian.org>
+
+	* functions/defaults.sh:
+	  - Set LH_APT to apt-get when using mini or minimal.
+	* helpers/lh_chroot_sources:
+	  - Excluding comments from local sources lists.
+	* helpers/lh_bootstrap_cdebootstrap:
+	  - Removing imported configuration files by cdebootstrap.
+
+2007-04-13  Daniel Baumann  <daniel@debian.org>
+
+	* Moved examples from /usr/share/doc to /usr/share/live-helper.
+	* examples/bpo.sources.list:
+	  - Added.
+	* functions/defaults.sh:
+	  - Setting LH_GENISOIMAGE on ubuntu to legacy mkisofs.
+	* helpers/lh_clean:
+	  - Added missing removal of generic source.
+
+2007-04-12  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_config, make-live:
+	  - Adding --config.
+	* helpers/lh_binary_memtester86:
+	  - Renamed to lh_binary_memtest, made more generic.
+	* functions/defaults.sh:
+	  - Setting default distribution to etch until 2.6.20 has setteled in
+	    unstable.
+
+2007-04-11  Daniel Baumann  <daniel@debian.org>
+
+	* Merging from sidux fllbuilder 1.0.4:
+	  - functions/chroot: Added LH_DEBCONF_NOWARNINGS.
+	  - helpers/lh_chroot_linuximage: Added additional options to
+	    kernel-img.conf.
+	  - helpers/lh_chroot_proc: Made binfmt umount conditional.
+	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
+	  - Added.
+	* helpers/lh_binary_grub, lh_binary_syslinux:
+	  - Added failsafe kernel entries.
+	* helpers/lh_chroot_apt:
+	  - Using apt.conf.d also for apt, not just for aptitude.
+	  - Minor code cleanup.
+	* helpers/lh_source_*:
+	  - Minor code cleanup.
+	* helpers/lh_source_download:
+	  - Added LIVE_BOOTLOADER to the list of source packages.
+	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
+	  - Added.
+
+2007-04-10  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_binary_includes, includes/*:
+	  - Redone.
+
+2007-04-09  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_binary_yaboot, templates/yaboot:
+	  - Added.
+
 2007-04-09  Daniel Baumann  <daniel@debian.org>
 
 	* helpers/lh_config, make-live, functions/defaults.sh:
@@ -5,6 +76,7 @@
 	* helpers/lh_chroot_sources:
 	  - Added check for LIVE_MIRROR_BUILD* to be equal to
 	    LIVE_MIRROR_IMAGE*.
+	* Uploaded 1.0~a5-1.
 
 2007-04-08  Daniel Baumann  <daniel@debian.org>
 
diff --git a/doc/FAQ b/doc/FAQ
index 0bdc3ba..593346b 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -4,14 +4,18 @@ Debian Live: Frequently Asked Questions (FAQ)
 Build Time
 ----------
 
+Q: Is live-helper/make-live Debian specific?
+A: live-helper supports Debian and Ubuntu right now. Adding automatic defaults
+   for other Debian derivatives is easy - let us know about them and we may
+   include it.
+
 Q: How do I drop in to a shell during make-live chroot process?
-A: Use "--interactive shell", then exit when you have made the setting changes
-   you want and the build process will continue.
+A: Use "--interactive shell", then exit with 'logout' when you have made the
+   setting changes you want and the build process will continue.
 
 Q: Where to set the username or the hostname?
 A: casper uses default username 'casper' and hostname 'live'. You can specify
-   them by passing 'username=' and 'hostname=' as kernel parameters (In previous
-   casper releases it was 'host=').
+   them by passing 'username=' and 'hostname=' as kernel parameters.
 
    live-helper automatically sets the username to 'user' and the hostname to
    'debian'. If you want to change this at build time, pass --username and
@@ -22,8 +26,8 @@ Run Time
 --------
 
 Q: What is the root password?
-A: There is none. You can switch to root with 'sudo -i' or set a password with
-   'sudo passwd'.
+A: There is none set. You can switch to root with 'sudo -i' or set a password
+   with 'sudo passwd'.
 
 Q: What is the user password?
 A: The password for the default user is 'live'.
diff --git a/doc/examples/live.sources.list b/doc/examples/live.sources.list
deleted file mode 100644
index 10fba02..0000000
--- a/doc/examples/live.sources.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# This is a sources.list for live-helper(7) to use packages from the
-# Debian Live Etch backports repository.
-#
-# To enable it, copy this file to your config/chroot_sources directory, once
-# as e.g. live.build and once as live.image.
-
-# Debian Live backports for Etch
-deb http://live.debian.net/debian/ etch main
-deb-src http://live.debian.net/debian/ etch main
diff --git a/doc/examples/beryl-hook.sh b/examples/beryl-hook.sh
index ef076e4..f1658a5 100755
--- a/doc/examples/beryl-hook.sh
+++ b/examples/beryl-hook.sh
@@ -4,7 +4,7 @@
 # It was originally written by Inigo Tejedor Arrondo <inigo@navarrux.org>.
 #
 # To enable it, copy this hook into your config/chroot_localhooks directory.
-# At boot prompt, type 'linux aixgl', press enter and have fun.
+# At boot prompt, type 'live aixgl', press enter and have fun.
 
 # Update sources.list
 cat >> /etc/apt/sources.list << EOF
diff --git a/examples/bpo.sources.list b/examples/bpo.sources.list
new file mode 100644
index 0000000..461c66f
--- /dev/null
+++ b/examples/bpo.sources.list
@@ -0,0 +1,9 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Etch backports repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. bpo.build and once as bpo.image.
+
+# Debian backports for Etch
+deb http://www.backports.org/debian/ etch-backports main
+deb-src http://www.backports.org/debian/ etch-backports main
diff --git a/doc/examples/java-hook.sh b/examples/java-hook.sh
index 77c931b..77c931b 100755
--- a/doc/examples/java-hook.sh
+++ b/examples/java-hook.sh
diff --git a/examples/live.sources.list b/examples/live.sources.list
new file mode 100644
index 0000000..98212f1
--- /dev/null
+++ b/examples/live.sources.list
@@ -0,0 +1,11 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Live Etch backports repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. live.build and once as live.image.
+##
+## Remeber to add debian-unofficial-archive-keyring to your package selection.
+
+# Debian Live backports for Etch
+deb http://live.debian.net/debian/ etch main
+deb-src http://live.debian.net/debian/ etch main
diff --git a/functions/chroot.sh b/functions/chroot.sh
index 643f08f..c463f66 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -15,5 +15,5 @@ Chroot ()
 
 	# Executing commands in chroot
 	Echo_debug "Executing: ${COMMANDS}"
-	chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" ${COMMANDS}
+	chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" ${COMMANDS}
 }
diff --git a/functions/common.sh b/functions/common.sh
index 61c10c1..a6e475f 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
 set -e
 
 PROGRAM="`basename ${0}`"
-VERSION="1.0~a5"
+VERSION="1.0~a6"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index e22ab93..5deaa54 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -16,7 +16,20 @@ Set_defaults ()
 	# Setting mode
 	if [ -z "${LH_MODE}" ]
 	then
-		LH_MODE="debian"
+		if [ -f /usr/bin/lsb_release ]
+		then
+			case "`lsb_release --short --id`" in
+				Debian)
+					LH_MODE="debian"
+					;;
+
+				Ubuntu)
+					LH_MODE="ubuntu"
+					;;
+			esac
+		else
+			LH_MODE="debian"
+		fi
 	fi
 
 	# Setting package manager
@@ -123,10 +136,23 @@ Set_defaults ()
 		LH_DEBCONF_PRIORITY="critical"
 	fi
 
+	if [ -z "${LH_DEBCONF_NOWARNINGS}" ]
+	then
+		LH_DEBCONF_NOWARNINGS="yes"
+	fi
+
 	# Setting genisoimage
 	if [ -z "${LH_GENISOIMAGE}" ]
 	then
-		LH_GENISOIMAGE="genisoimage"
+		case "${LH_MODE}" in
+			debian)
+				LH_GENISOIMAGE="genisoimage"
+				;;
+
+			ubuntu)
+				LH_GENISOIMAGE="mkisofs"
+				;;
+		esac
 	fi
 
 	# Setting losetup
@@ -202,7 +228,7 @@ Set_defaults ()
 	then
 		case "${LH_MODE}" in
 			debian)
-				LIVE_DISTRIBUTION="sid"
+				LIVE_DISTRIBUTION="etch"
 				;;
 
 			ubuntu)
@@ -407,19 +433,23 @@ Set_defaults ()
 	for LIST in ${LIVE_PACKAGES_LISTS}
 	do
 		case "${LIST}" in
+			mini|minimal)
+				LH_APT="apt-get"
+				;;
+
 			gnome-desktop)
 				LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/gnome-desktop//'` standard-x11"
-				LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop desktop gnome-desktop"
+				LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop gnome-desktop desktop"
 				;;
 
 			kde-desktop)
 				LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/kde-desktop//'` standard-x11"
-				LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop desktop kde-desktop"
+				LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop kde-desktop desktop"
 				;;
 
 			xfce-desktop)
 				LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/xfce-desktop//'` standard-x11"
-				LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop desktop xfce-desktop"
+				LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop xfce-desktop desktop"
 				;;
 		esac
 	done
@@ -427,6 +457,8 @@ Set_defaults ()
 	LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/  //g'`"
 	LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/  //g'`"
 
+	# LIVE_HOOKS
+
 	# Setting security updates option
 	if [ -z "${LIVE_SECURITY}" ]
 	then
@@ -491,10 +523,10 @@ Set_defaults ()
 		LIVE_FILESYSTEM="squashfs"
 	fi
 
-	# Setting memtest86 option
-	if [ -z "${LIVE_MEMTEST86}" ]
+	# Setting memtest option
+	if [ -z "${LIVE_MEMTEST}" ]
 	then
-		LIVE_MEMTEST86="enabled"
+		LIVE_MEMTEST="memtest86+"
 	fi
 
 	# Setting iso volume
@@ -540,7 +572,15 @@ Set_defaults ()
 	# Setting grub
 	if [ -z "${LIVE_BOOTLOADER}" ]
 	then
-		LIVE_BOOTLOADER="syslinux"
+		case "${LIVE_ARCHITECTURE}" in
+			i386)
+				LIVE_BOOTLOADER="syslinux"
+				;;
+
+			powerpc)
+				LIVE_BOOTLOADER="yaboot"
+				;;
+		esac
 	fi
 
 	# Setting grub splash
diff --git a/functions/exit.sh b/functions/exit.sh
new file mode 100755
index 0000000..ff76c36
--- /dev/null
+++ b/functions/exit.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# exit.sh - cleanup
+# 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
+
+Exit ()
+{
+	if [ "${LH_DEBUG}" = "enabled" ]
+	then
+		set | grep -e ^LH -e ^LIVE
+	fi
+
+	# FIXME: Add /proc et al cleanup on failure
+}
diff --git a/helpers/lh_binary b/helpers/lh_binary
index 1326637..8498d93 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -42,9 +42,10 @@ lh_binary_encryption "${@}"
 
 # Prepare images
 lh_binary_linuximage "${@}"
-lh_binary_memtest86 "${@}"
+lh_binary_memtest "${@}"
 lh_binary_grub "${@}"
 lh_binary_syslinux "${@}"
+lh_binary_yaboot "${@}"
 lh_binary_includes "${@}"
 lh_binary_localincludes "${@}"
 lh_binary_md5sum "${@}"
diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index 86da15d..24ee5f8 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -36,20 +36,32 @@ Breakpoint "binary_chroot: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/binary_chroot
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_chroot
+# Normally, proc is not mounted here, but people tend to be lazy
+if [ -f chroot/proc/version ]
+then
+	umount chroot/proc
+fi
+
+if [ -d chroot/sys/kernel ]
+then
+	umount chroot/sys
+fi
 
 # Removing old chroot
 rm -rf chroot/chroot
 rm -rf chroot.tmp
 
 # Copying new chroot
+Echo_message "Copying chroot, this can take a while."
 cp -a chroot chroot.tmp
 mv chroot.tmp chroot/chroot
 
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index 09c0fea..c10ba9a 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -42,22 +42,22 @@ Breakpoint "binary_encryption: Init"
 Require_stagefile .stage/bootstrap
 Require_stagefile .stage/binary_rootfs
 
+# Checking stage file
+Check_stagefile .stage/binary_encryption
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_encryption
-
 case "${LIVE_FILESYSTEM}" in
 	ext2)
 		ROOTFS="ext2"
 		;;
 
 	plain)
-		echo "W: encryption not supported on plain filesystem."
+		Echo_warning "encryption not supported on plain filesystem."
 		exit 0
 		;;
 
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index c115f79..3b652af 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -41,15 +41,15 @@ Breakpoint "binary_grub: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/binary_grub
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_grub
-
 if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
 then
 	Echo_warning "skipping binary_grub, foreign architecture."
@@ -94,18 +94,23 @@ case "${LIVE_BINARY_IMAGE}" in
 		;;
 
 	net)
-		Echo_error "not supported, FIXME"
+		Echo_error "not supported, aborting (FIXME)."
+		exit 1
 	;;
 esac
 
 # Temporary check for broken syslinux
 if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
 then
-	case "${LIVE_ARCHITECTURE}" in
-		i386)
-			DESTDIR="${DESTDIR}.386"
-			;;
-	esac
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+		esac
+	fi
 fi
 
 # Creating directory
@@ -132,15 +137,13 @@ 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"
+
 # Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-then
-	DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
-	LINUX="title\t\tDebian GNU/Linux - Live\nkernel\t\t/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
-else
-	DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
-	LINUX="title\t\tDebian GNU/Linux - Live\nkernel\t\t`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\ninitrd\t\tinitrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
-fi
+DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
+LINUX="title\t\tDebian GNU/Linux - Live\nkernel\t\t/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=casper LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
+LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live (failsafe mode)\nkernel\t\t/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
 
 if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
 then
@@ -148,20 +151,12 @@ then
 	do
 		if [ -z "${LINUX}" ]
 		then
-			if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-		then
-				LINUX="title\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t/`basename ${DESTDIR}`/`basename ${KERNEL}`\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
-			else
-				LINUX="title\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t`basename ${KERNEL}`\ninitrd\t\tinitrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
-			fi
+			LINUX="title\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t/`basename ${DESTDIR}`/`basename ${KERNEL}` boot=casper LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (failsafe mode)\nkernel\t\t/`basename ${DESTDIR}`/`basename ${KERNEL}` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
 		else
-			if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-			then
-				LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
-			else
-				LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel `basename ${KERNEL}`\ninitrd\t\tinitrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
-			fi
-			fi
+			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR}`/`basename ${KERNEL}` boot=casper LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (failsafe mode)\nkernel /`basename ${DESTDIR}`/`basename ${KERNEL}` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+		fi
 	done
 fi
 
@@ -170,18 +165,15 @@ LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 # Assembling memtest configuration
 if [ -f "${DESTDIR}"/memtest ]
 then
-	if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-	then
-		MEMTEST="title\t\tMemtest86+\nkernel\t\t/`basename ${DESTDIR}`/memtest"
-		MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-	else
-		MEMTEST="title\t\tMemtest86+\nkernel\t\tmemtest"
-	fi
+	MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR}`/memtest"
+	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
 fi
 
+# Copying templates
 mkdir -p binary/boot/grub
 cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
 
+# Copyring grub
 case ${LIVE_BINARY_IMAGE} in
 	iso)
 		cp chroot/usr/lib/grub/i386-pc/stage2_eltorito binary/boot/grub
@@ -195,10 +187,17 @@ esac
 # Copying splash screen
 if [ -n "${LIVE_GRUB_SPLASH}" ]
 then
-	# FIXME
-	cp "${LIVE_GRUB_SPLASH}" binary/boot/grub
+	if [ "${LIVE_GRUB_SPLASH}" = "none" ]
+	then
+		# Removing splash file
+		rm -f binary/boot/grub/splash.xpm.gz
 
-	LIVE_SPLASH="splashimage /boot/grub/`basename ${LIVE_GRUB_SPLASH}`"
+		# Removing splash entry
+		sed -e "s/splashimage.*//" binary/boot/grub/menu.lst
+	else
+		# Overwriting splash file
+		cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz
+	fi
 fi
 
 # Configure grub templates
@@ -208,11 +207,10 @@ cat >> binary/boot/grub/menu.lst << EOF
 title		Other:
 root
 
-
 LIVE_MEMTEST
 EOF
 
-sed -i -e "s#LIVE_SPLASH#${LIVE_SPLASH}#" -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
+sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
 sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
 
 if [ -n "${PACKAGES}" ]
diff --git a/helpers/lh_binary_hdd b/helpers/lh_binary_hdd
index 5a450ab..545ae84 100755
--- a/helpers/lh_binary_hdd
+++ b/helpers/lh_binary_hdd
@@ -41,15 +41,15 @@ do
 		# Requiring stage file
 		Require_stagefile .stage/bootstrap
 
+		# Checking stage file
+		Check_stagefile .stage/binary_hdd
+
 		# Checking lock file
 		Check_lockfile .lock
 
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Checking stage file
-		Check_stagefile .stage/binary_hdd
-
 		# Remove old binary
 		if [ -f binary-hdd.tar.gz ]
 		then
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index e343d72..18ad540 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -41,15 +41,15 @@ Breakpoint "binary_includes: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/binary_includes
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_includes
-
 # Check includes
 if [ ! -d "${LIVE_INCLUDES}" ]
 then
@@ -62,18 +62,51 @@ then
 	fi
 fi
 
-if ls "${LIVE_INCLUDES}"/common/* &> /dev/null
-then
-	cd "${LIVE_INCLUDES}"/common
-	find . | cpio -dmpu "${OLDPWD}"/binary
-	cd "${OLDPWD}"
-fi
+# Assemble architecture
+case "${LIVE_ARCHITECTURE}" in
+	amd64)
+		ARCH="amd"
+		;;
+
+	i386)
+		ARCH="386"
+		;;
 
-if ls "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"/* &> /dev/null
+	powerpc)
+		ARCH="ppc"
+		;;
+esac
+
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
 then
-	cd "${LIVE_INCLUDES}"/"${LIVE_BINARY_IMAGE}"
-	find . | cpio -dmpu "${OLDPWD}"/binary
-	cd "${OLDPWD}"
+	# Copying d-i templates
+	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
+	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
+	then
+		cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
+	fi
+
+	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
+	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
+	then
+		cp -r "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
+	fi
+
+	# Adjusting d-i templates
+	DEBIAN_NAME="/Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+	DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
+
+	if [ "${LIVE_ARCHITECTURE}" = "i386" ]
+	then
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
+		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
+	else
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
+		DEBIAN_TOOLS_TXT="/tools/"
+	fi
+
+	sed -i -e "s/DEBIAN_NAME/${DEBIAN_NAME}/g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s/DEBIAN_TOOLS/${DEBIAN_TOOLS_HTML}/g" binary/README.html
+	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
 
 # Creating stage file
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index c77394e..63156aa 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -40,15 +40,15 @@ do
 		# Requiring stage file
 		Require_stagefile .stage/bootstrap
 
+		# Checking stage file
+		Check_stagefile .stage/binary_iso
+
 		# Checking lock file
 		Check_lockfile .lock
 
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Checking stage file
-		Check_stagefile .stage/binary_iso
-
 		if [ ! -f chroot/usr/bin/"${LH_GENISOIMAGE}" ]
 		then
 			PACKAGES="${PACKAGES} ${LH_GENISOIMAGE}"
@@ -91,7 +91,7 @@ do
 					;;
 			esac
 		else
-			echo "W: Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
+			Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
 			sleep 5
 			#Chroot "${LH_GENISOIMAGE} -A 'Debian Live' -p 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org' -publisher 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org' -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" binary"
 			Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l binary"
diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linuximage
index bcdddc1..600aeaa 100755
--- a/helpers/lh_binary_linuximage
+++ b/helpers/lh_binary_linuximage
@@ -36,15 +36,15 @@ Breakpoint "binary_linuximage: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/binary_linuximage
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_linuximage
-
 # Removing initrd backup files
 rm -f chroot/boot/initrd*bak*
 
@@ -66,11 +66,15 @@ esac
 # Temporary check for broken syslinux
 if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
 then
-	case "${LIVE_ARCHITECTURE}" in
-		i386)
-			DESTDIR="${DESTDIR}.386"
-			;;
-	esac
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+		esac
+	fi
 fi
 
 # Creating directory
diff --git a/helpers/lh_binary_localincludes b/helpers/lh_binary_localincludes
index dc427d9..dcbaa2c 100755
--- a/helpers/lh_binary_localincludes
+++ b/helpers/lh_binary_localincludes
@@ -36,15 +36,15 @@ Breakpoint "binary_localincludes: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/binary_localincludes
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_localincludes
-
 if ls config/binary_localincludes/* &> /dev/null
 then
 	# Copying includes
diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest
index e90f98b..f8c3899 100755
--- a/helpers/lh_binary_manifest
+++ b/helpers/lh_binary_manifest
@@ -36,15 +36,15 @@ Breakpoint "binary_manifest: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/binary_manifest
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_manifest
-
 # Add filesystem.manifest
 Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/casper/filesystem.manifest
 
diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum
index 96e1007..59864ce 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -36,15 +36,15 @@ Breakpoint "binary_md5sum: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/binary_md5sum
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_md5sum
-
 # Remove old md5sums
 if [ -f binary/md5sum.txt ]
 then
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
new file mode 100755
index 0000000..48c8001
--- /dev/null
+++ b/helpers/lh_binary_memtest
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+# lh_binary_memtest(1) - installs a memtest 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs a memtest into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/common
+Read_conffile config/image
+Set_defaults
+
+if [ "${LIVE_MEMTEST}" = "disabled" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_memtest: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_memtest
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+	Echo_warning "skipping binary_memtest, foreign architecture."
+	exit 0
+fi
+
+case "${LIVE_MEMTEST}" in
+	memtest86)
+		if [ ! -f chroot/boot/memtest86.bin ]
+		then
+			PACKAGES="${PACKAGES} memtest86"
+		fi
+		;;
+
+	memtest86+)
+		if [ ! -f chroot/boot/memtest86+.bin ]
+		then
+			PACKAGES="${PACKAGES} memtest86+"
+		fi
+		;;
+esac
+
+if [ -n "${PACKAGES}" ]
+then
+	# Installing symlinks
+	case "${LH_APT}" in
+		apt|apt-get)
+			Chroot "apt-get install --yes ${PACKAGES}"
+			;;
+
+		aptitude)
+			Chroot "aptitude install --assume-yes ${PACKAGES}"
+			;;
+	esac
+fi
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGE}" in
+	iso)
+		DESTDIR="binary/live"
+		;;
+
+	net)
+		DESTDIR="tftpboot"
+		;;
+
+	usb|hdd)
+		DESTDIR="binary"
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+		esac
+	fi
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR}" ]
+then
+	mkdir -p "${DESTDIR}"
+fi
+
+# Installing memtest
+case "${LIVE_MEMTEST}" in
+	memtest86)
+		cp -f chroot/boot/memtest86.bin "${DESTDIR}"/memtest
+		;;
+
+	memtest86+)
+		cp -f chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
+		;;
+esac
+
+if [ -n "${PACKAGES}" ]
+then
+	# Removing packages
+	case "${LH_APT}" in
+		apt|apt-get)
+			Chroot "apt-get remove --purge --yes ${PACKAGES}"
+			;;
+
+		aptitude)
+			Chroot "aptitude purge --assume-yes ${PACKAGES}"
+			;;
+	esac
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_memtest
diff --git a/helpers/lh_binary_memtest86 b/helpers/lh_binary_memtest86
deleted file mode 100755
index 5f5e89c..0000000
--- a/helpers/lh_binary_memtest86
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-
-# lh_binary_memtest86(1) - installs memtest86+ 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs memtest86+ into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "binary_memtest86: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking stage file
-Check_stagefile .stage/binary_memtest86
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
-	echo "W: skipping binary_memtest86, foreign architecture."
-	exit 0
-fi
-
-if [ "${LIVE_MEMTEST86}" = "enabled" ]
-then
-	if [ ! -f chroot/boot/memtest86+.bin ]
-	then
-		PACKAGES="${PACKAGES} memtest86+"
-	fi
-
-	if [ -n "${PACKAGES}" ]
-	then
-		# Installing symlinks
-		case "${LH_APT}" in
-			apt|apt-get)
-				Chroot "apt-get install --yes ${PACKAGES}"
-				;;
-
-			aptitude)
-				Chroot "aptitude install --assume-yes ${PACKAGES}"
-				;;
-		esac
-	fi
-
-	# Setting destination directory
-	case "${LIVE_BINARY_IMAGE}" in
-		iso)
-			DESTDIR="binary/live"
-			;;
-
-		net)
-			DESTDIR="tftpboot"
-			;;
-
-		usb|hdd)
-			DESTDIR="binary"
-			;;
-	esac
-
-	# Temporary check for broken syslinux
-	if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			i386)
-				DESTDIR="${DESTDIR}.386"
-				;;
-		esac
-	fi
-
-	# Creating directory
-	if [ ! -d "${DESTDIR}" ]
-	then
-		mkdir -p "${DESTDIR}"
-	fi
-
-	# Installing memtest86+
-	cp chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
-
-	if [ -n "${PACKAGES}" ]
-	then
-		# Removing packages
-		case "${LH_APT}" in
-			apt|apt-get)
-				Chroot "apt-get remove --purge --yes ${PACKAGES}"
-				;;
-
-			aptitude)
-				Chroot "aptitude purge --assume-yes ${PACKAGES}"
-				;;
-		esac
-	fi
-
-	# Creating stage file
-	Create_stagefile .stage/binary_memtest86
-fi
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net
index 2acd2fb..f07e5e6 100755
--- a/helpers/lh_binary_net
+++ b/helpers/lh_binary_net
@@ -40,15 +40,15 @@ do
 		# Requiring stage file
 		Require_stagefile .stage/bootstrap
 
+		# Checking stage file
+		Check_stagefile .stage/binary_net
+
 		# Checking lock file
 		Check_lockfile .lock
 
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Checking stage file
-		Check_stagefile .stage/binary_net
-
 		# Remove old binary
 		if [ -f binary-net.tar.gz ]
 		then
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index a1d3d3a..daacaea 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -37,15 +37,15 @@ Breakpoint "binary_rootfs: Init"
 Require_stagefile .stage/bootstrap
 Require_stagefile .stage/binary_chroot
 
+# Checking stage file
+Check_stagefile .stage/binary_rootfs
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_rootfs
-
 # Creating directory
 if [ ! -d binary/casper ]
 then
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 3afc191..dff16f4 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -31,76 +31,82 @@ Read_conffile config/common
 Read_conffile config/image
 Set_defaults
 
+if [ "${LIVE_BOOTLOADER}" != "syslinux" ]
+then
+	exit 0
+fi
+
 Breakpoint "binary_syslinux: Init"
 
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/binary_syslinux
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/binary_syslinux
-
 if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
 then
-	echo "W: skipping binary_syslinux, foreign architecture."
+	Echo_warning "skipping binary_syslinux, foreign architecture."
 	exit 0
 fi
 
-if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+# Check templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
 then
-	# Check templates
-	if [ ! -d "${LIVE_TEMPLATES}" ]
+	if [ -d ../"${LIVE_TEMPLATES}" ]
 	then
-		if [ -d ../"${LIVE_TEMPLATES}" ]
-		then
-			LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
-		else
-			Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
-			exit 1
-		fi
-	fi
-
-	if [ ! -f chroot/usr/bin/syslinux ]
-	then
-		PACKAGES="${PACKAGES} syslinux"
-	fi
-
-	if [ -n "${PACKAGES}" ]
-	then
-		# Installing symlinks
-		case "${LH_APT}" in
-			apt|apt-get)
-				Chroot "apt-get install --yes ${PACKAGES}"
-				;;
-
-			aptitude)
-				Chroot "aptitude install --assume-yes ${PACKAGES}"
-				;;
-		esac
+		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+	else
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
 	fi
+fi
 
-	# Setting destination directory
-	case "${LIVE_BINARY_IMAGE}" in
-		iso)
-			DESTDIR="binary/live"
-			;;
+if [ ! -f chroot/usr/bin/syslinux ]
+then
+	PACKAGES="${PACKAGES} syslinux"
+fi
 
-		net)
-			DESTDIR="tftpboot"
+if [ -n "${PACKAGES}" ]
+then
+	# Installing symlinks
+	case "${LH_APT}" in
+		apt|apt-get)
+			Chroot "apt-get install --yes ${PACKAGES}"
 			;;
 
-		usb|hdd)
-			DESTDIR="binary"
+		aptitude)
+			Chroot "aptitude install --assume-yes ${PACKAGES}"
 			;;
 	esac
+fi
 
-	# Temporary check for broken syslinux
-	if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+# Setting destination directory
+case "${LIVE_BINARY_IMAGE}" in
+	iso)
+		DESTDIR="binary/live"
+		;;
+
+	net)
+		DESTDIR="tftpboot"
+	;;
+
+	usb|hdd)
+		DESTDIR="binary"
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+then
+	# Assembling multi-arch
+	if [ -n "${MULTIARCH}" ]
 	then
 		case "${LIVE_ARCHITECTURE}" in
 			i386)
@@ -108,218 +114,245 @@ then
 				;;
 		esac
 	fi
+fi
 
-	# Creating directory
-	if [ ! -d "${DESTDIR}" ]
-	then
-		mkdir -p "${DESTDIR}"
-	fi
+# Creating directory
+if [ ! -d "${DESTDIR}" ]
+then
+	mkdir -p "${DESTDIR}"
+fi
 
-	# Setting boot parameters
-	if [ -n "${LIVE_ENCRYPTION}" ]
-	then
-		LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-	fi
+# Setting boot parameters
+if [ -n "${LIVE_ENCRYPTION}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+fi
 
-	if [ -n "${LIVE_USERNAME}" ]
-	then
-		LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
-	fi
+if [ -n "${LIVE_USERNAME}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+fi
 
-	if [ -n "${LIVE_HOSTNAME}" ]
-	then
-		LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
-	fi
+if [ -n "${LIVE_HOSTNAME}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+fi
 
-	LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
 
-	# Assembling kernel configuration
-	if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-	then
-		DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
-		LINUX="label LIVE\n  kernel /`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
-	else
-		DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
-		LINUX="label LIVE\n  kernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n  append initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
-	fi
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
 
-	if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
-	then
-		for KERNEL in chroot/boot/vmlinuz*
-		do
-			if [ -z "${LINUX}" ]
+# Assembling kernel configuration
+if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+then
+	DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
+	LINUX="label LIVE\n  kernel /`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+	LINUX="${LINUX}\nlabel LIVE-failsafe\n  kernel /`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}"
+else
+	DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
+	LINUX="label LIVE\n  kernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n  append initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+	LINUX="${LINUX}\nlabel LIVE-failsafe\n  kernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n  append initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}"
+fi
+
+if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+then
+	for KERNEL in chroot/boot/vmlinuz*
+	do
+		if [ -z "${LINUX}" ]
+		then
+			if [ "${LIVE_BINARY_IMAGE}" = "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=casper LIVE_BOOTAPPEND"
+				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}"
+		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=casper LIVE_BOOTAPPEND"
+				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=casper LIVE_BOOTAPPEND ${FAILSAFE}"
+			fi
+		else
+			if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
 			then
-				if [ "${LIVE_BINARY_IMAGE}" = "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=casper 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=casper LIVE_BOOTAPPEND"
-				fi
+			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=casper LIVE_BOOTAPPEND"
+			LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND ${FAILSAFE}"
 			else
-				if [ "${LIVE_BINARY_IMAGE}" = "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=casper 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=casper LIVE_BOOTAPPEND"
-				fi
+				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=casper LIVE_BOOTAPPEND"
+				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=casper LIVE_BOOTAPPEND ${FAILSAFE}"
 			fi
-		done
-	fi
+		fi
+	done
+fi
 
-	LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
-	# Assembling memtest configuration
-	if [ -f "${DESTDIR}"/memtest ]
+# Assembling memtest configuration
+if [ -f "${DESTDIR}"/memtest ]
+then
+	if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
 	then
-		if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-		then
-			MEMTEST="label memtest\n  kernel /`basename ${DESTDIR}`/memtest"
-			MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-		else
-			MEMTEST="label memtest\n  kernel memtest"
-		fi
+		MEMTEST="label memtest\n  kernel /`basename ${DESTDIR}`/memtest"
+		MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+	else
+		MEMTEST="label memtest\n  kernel memtest"
 	fi
+fi
 
-	case "${LIVE_BINARY_IMAGE}" in
-		iso)
-			# Copying syslinux
-			mkdir -p binary/isolinux
-			cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
-			cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
+case "${LIVE_BINARY_IMAGE}" in
+	iso)
+		# Copying syslinux
+		mkdir -p binary/isolinux
+		cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
+		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
 
-			# Copying splash screen
-			if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		# Copying splash screen
+		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		then
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
 			then
-				cp "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
+				rm -f binary/isolinux/splash.rle
+				sed -e "s/.*splash.*//" binary/isolinux/isolinux.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
 			fi
+		fi
 
-			# Configure syslinux templates
-			sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
-			sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
-			sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
-			sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
+		# Configure syslinux templates
+		sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
+		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
+		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
 
-			# Remove unused files
-			rm -f binary/isolinux/pxelinux.cfg
+		# Remove unused files
+		rm -f binary/isolinux/pxelinux.cfg
 
-			# Working arround syslinux 8.3 limitation
-			if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
-			then
-				for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
-				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/isolinux/isolinux.cfg
-				done
-			else
-				mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
-				mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
-				sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" binary/isolinux/isolinux.cfg
-			fi
-			;;
+		# Working arround syslinux 8.3 limitation
+		if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+		then
+			for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
+			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/isolinux/isolinux.cfg
+			done
+		else
+			mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
+			mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
+			sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" binary/isolinux/isolinux.cfg
+		fi
+		;;
 
-		net)
-			# Copying syslinux
-			cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
+	net)
+		# Copying syslinux
+		cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
 
-			# Install syslinux templates
-			mkdir -p tftpboot/pxelinux.cfg
-			cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
-			mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
-			sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/isolinux.txt
+		# Install syslinux templates
+		mkdir -p tftpboot/pxelinux.cfg
+		cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
+		mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
+		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/isolinux.txt
 
-			# Copying splash screen
-			if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		# Copying splash screen
+		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		then
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
 			then
-				cp "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
+				rm -f tftpboot/pxelinux.cfg/splash.rle
+				sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/isolinux.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
 			fi
+		fi
 
-			# Configure syslinux templates
-			sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
-			sed -i -e "s/LIVE_SERVER_ADDRESS/${LIVE_SERVER_ADDRESS}/" -e "s#LIVE_SERVER_PATH#${LIVE_SERVER_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
-			sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
-			sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
+		# Configure syslinux templates
+		sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
+		sed -i -e "s/LIVE_SERVER_ADDRESS/${LIVE_SERVER_ADDRESS}/" -e "s#LIVE_SERVER_PATH#${LIVE_SERVER_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
+		sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
 
-			# Remove unused files
-			rm -f tftpboot/pxelinux.cfg/isolinux.cfg
+		# Remove unused files
+		rm -f tftpboot/pxelinux.cfg/isolinux.cfg
 
-			# Working arround syslinux 8.3 limitation
-			if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+		# Working arround syslinux 8.3 limitation
+		if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+		then
+			for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
+			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/" tftpboot/pxelive.cfg/default
+			done
+		else
+			mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
+			mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
+			sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" tftpboot/pxelinux.cfg/default
+		fi
+		;;
+
+	usb|hdd)
+		# Copying syslinux
+		mkdir -p binary
+		cp chroot/usr/lib/syslinux/isolinux.bin binary/syslinux.bin
+		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary
+		mv binary/isolinux.cfg binary/syslinux.cfg
+		mv binary/isolinux.txt binary/syslinux.txt
+		sed -i -e "s/isolinux.txt/syslinux.txt/" binary/syslinux.cfg
+
+		# Copying splash screen
+		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		then
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
 			then
-				for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
-				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/" tftpboot/pxelive.cfg/default
-				done
+				rm -f binary/splash.rle
+				sed -e "s/.*splash.*//" binary/syslinux.txt
 			else
-				mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
-				mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
-				sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" tftpboot/pxelinux.cfg/default
+				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/splash.rle
 			fi
-			;;
+		fi
 
-		usb|hdd)
-			# Copying syslinux
-			mkdir -p binary
-			cp chroot/usr/lib/syslinux/isolinux.bin binary/syslinux.bin
-			cp -r "${LIVE_TEMPLATES}"/syslinux/* binary
-			mv binary/isolinux.cfg binary/syslinux.cfg
-			mv binary/isolinux.txt binary/syslinux.txt
-			sed -i -e "s/isolinux.txt/syslinux.txt/" binary/syslinux.cfg
-
-			# Copying splash screen
-			if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
-			then
-				cp "${LIVE_SYSLINUX_SPLASH}" binary/splash.rle
-			fi
+		# Configure syslinux templates
+		sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
+		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/syslinux.cfg
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/f1.txt
+		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/f10.txt
 
-			# Configure syslinux templates
-			sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
-			sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/syslinux.cfg
-			sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/f1.txt
-			sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/f10.txt
+		# Remove unused files
+		rm -f binary/pxelinux.cfg
 
-			# Remove unused files
-			rm -f binary/pxelinux.cfg
+		# Working arround syslinux 8.3 limitation
+		if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+		then
+			for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
+			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/syslinux.cfg
+			done
+		else
+			mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
+			mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
+			sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" binary/syslinux.cfg
+		fi
+		;;
+esac
 
-			# Working arround syslinux 8.3 limitation
-			if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
-			then
-				for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
-				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/syslinux.cfg
-				done
-			else
-				mv "${DESTDIR}"/vmlinuz-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
-				mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
-				sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" binary/syslinux.cfg
-			fi
+if [ -n "${PACKAGES}" ]
+then
+	# Removing packages
+	case "${LH_APT}" in
+		apt|apt-get)
+			Chroot "apt-get remove --purge --yes ${PACKAGES}"
 			;;
-	esac
-
-	if [ -n "${PACKAGES}" ]
-	then
-		# Removing packages
-		case "${LH_APT}" in
-			apt|apt-get)
-				Chroot "apt-get remove --purge --yes ${PACKAGES}"
-				;;
 
-			aptitude)
-				Chroot "aptitude purge --assume-yes ${PACKAGES}"
-				;;
-		esac
-	fi
-
-	# Creating stage file
-	Create_stagefile .stage/binary_syslinux
+		aptitude)
+			Chroot "aptitude purge --assume-yes ${PACKAGES}"
+			;;
+	esac
 fi
+
+# Creating stage file
+Create_stagefile .stage/binary_syslinux
diff --git a/helpers/lh_binary_usb b/helpers/lh_binary_usb
index 228250e..291f877 100755
--- a/helpers/lh_binary_usb
+++ b/helpers/lh_binary_usb
@@ -41,15 +41,15 @@ do
 		Require_stagefile .stage/bootstrap
 		Require_stagefile .stage/chroot_proc
 
+		# Checking stage file
+		Check_stagefile .stage/binary_usb
+
 		# Checking lock file
 		Check_lockfile .lock
 
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Checking stage file
-		Check_stagefile .stage/binary_usb
-
 		if [ ! -f chroot/sbin/mkdosfs ]
 		then
 			PACKAGES="${PACKAGES} dosfstools"
@@ -65,15 +65,21 @@ do
 			PACKAGES="${PACKAGES} parted"
 		fi
 
-		if [ "${LIVE_BOOTLOADER}" = "grub" ] && [ ! -f chroot/usr/sbin/grub ]
-		then
-			PACKAGES="${PACKAGES} grub"
-		fi
+		case "${LIVE_BOOTLOADER}" in
+			grub)
+				if [ ! -f chroot/usr/sbin/grub ]
+				then
+					PACKAGES="${PACKAGES} grub"
+				fi
+				;;
 
-		if [ "${LIVE_BOOTLOADER}" = "syslinux" ] && [ ! -f chroot/usr/bin/syslinux ]
-		then
-			PACKAGES="${PACKAGES} syslinux"
-		fi
+			syslinux)
+				if [ ! -f chroot/usr/bin/syslinux ]
+				then
+					PACKAGES="${PACKAGES} syslinux"
+				fi
+				;;
+		esac
 
 		if [ -n "${PACKAGES}" ]
 		then
@@ -117,7 +123,15 @@ do
 
 		case "${LIVE_BOOTLOADER}" in
 			grub)
-				Chroot "grub-install --no-floppy ${FREELO}"
+				#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)
@@ -127,6 +141,7 @@ do
 
 		${LH_LOSETUP} -d ${FREELO}
 
+		FREELO="`${LH_LOSETUP} -f`"
 		lh_losetup $FREELO binary.img 1
 		Chroot "mkfs.msdos -n DEBIAN_LIVE ${FREELO}"
 		mkdir -p binary.tmp
@@ -134,8 +149,24 @@ do
 		cp -r binary/* binary.tmp
 		umount binary.tmp
 		rmdir binary.tmp
-		Chroot "syslinux ${FREELO}"
+
+		if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+		then
+			Chroot "syslinux ${FREELO}"
+		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}" ]
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
new file mode 100755
index 0000000..f891927
--- /dev/null
+++ b/helpers/lh_binary_yaboot
@@ -0,0 +1,217 @@
+#!/bin/sh
+
+# lh_binary_yaboot(1) - installs yaboot 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs yaboot into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/common
+Read_conffile config/image
+Set_defaults
+
+if [ "${LIVE_BOOTLOADER}" != "yaboot" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_yaboot: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_yaboot
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
+then
+	Echo_warning "skipping binary_yaboot, foreign architecture."
+	exit 0
+fi
+
+# Check templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+	if [ -d ../"${LIVE_TEMPLATES}" ]
+	then
+		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+	else
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	fi
+fi
+
+if [ ! -f chroot/usr/lib/yaboot/yaboot ]
+then
+	PACKAGES="${PACKAGES} yaboot"
+fi
+
+if [ -n "${PACKAGES}" ]
+then
+	# Installing symlinks
+	case "${LH_APT}" in
+		apt|apt-get)
+			Chroot "apt-get install --yes ${PACKAGES}"
+			;;
+
+		aptitude)
+			Chroot "aptitude install --assume-yes ${PACKAGES}"
+			;;
+	esac
+fi
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGE}" in
+	iso)
+		DESTDIR="binary/live"
+		;;
+
+	net|usb|hdd)
+		Echo_error "not supported, FIXME"
+	;;
+esac
+
+# Temporary check for broken yaboot
+if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+then
+	case "${LIVE_ARCHITECTURE}" in
+		powerpc)
+			DESTDIR="${DESTDIR}.ppc"
+			;;
+	esac
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR}" ]
+then
+	mkdir -p "${DESTDIR}"
+fi
+
+# Setting boot parameters
+if [ -n "${LIVE_ENCRYPTION}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+fi
+
+if [ -n "${LIVE_USERNAME}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+fi
+
+if [ -n "${LIVE_HOSTNAME}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
+
+# Assembling kernel configuration
+if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+then
+	DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | 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=casper LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
+else
+	DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | 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=casper LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
+fi
+
+# FIXME
+if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+then
+	for KERNEL in chroot/boot/vmlinuz*
+	do
+		if [ -z "${LINUX}" ]
+		then
+			if [ "${LIVE_BINARY_IMAGE}" = "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=casper 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=casper LIVE_BOOTAPPEND"
+		fi
+		else
+			if [ "${LIVE_BINARY_IMAGE}" = "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=casper 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=casper LIVE_BOOTAPPEND"
+			fi
+		fi
+	done
+fi
+
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+case "${LIVE_BINARY_IMAGE}" in
+	iso)
+		# Copying yaboot
+		mkdir -p binary/install
+		cp chroot/usr/lib/yaboot/yaboot binary/install
+		cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot
+
+		# Configure yaboot templates
+		sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_KERNEL_INSTALL#${LIVE_KERNEL_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/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_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]
+		then
+			for FLAVOUR in ${LIVE_KERNEL_FLAVOUR}
+			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_KERNEL_FLAVOUR} "${DESTDIR}"/vmlinuz
+			mv "${DESTDIR}"/initrd.img-*-${LIVE_KERNEL_FLAVOUR} "${DESTDIR}"/initrd.img
+			sed -i -e "s/LIVE.*-${LIVE_KERNEL_FLAVOUR}/live/g" -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
+		fi
+		;;
+esac
+
+if [ -n "${PACKAGES}" ]
+then
+	# Removing packages
+	case "${LH_APT}" in
+		apt|apt-get)
+			Chroot "apt-get remove --purge --yes ${PACKAGES}"
+			;;
+
+		aptitude)
+			Chroot "aptitude purge --assume-yes ${PACKAGES}"
+			;;
+	esac
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_yaboot
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 9581d8c..5453d02 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -137,6 +137,11 @@ then
 		Chroot "dpkg -P cdebootstrap-helper-diverts"
 	fi
 
+	# Deconfiguring cdebootstrap configurations
+	rm -f chroot/etc/apt/sources.list
+	rm -f chroot/etc/hosts
+	rm -f chroot/etc/resolv.conf
+
 	# Removing bootstrap cache
 	if [ -d chroot/var/cache/bootstrap ]
 	then
@@ -157,6 +162,6 @@ then
 	# Creating stage file
 	Create_stagefile .stage/bootstrap
 else
-	echo "E: Can't process file /usr/bin/cdebootstrap (FIXME)"
+	Echo_error "Can't process file /usr/bin/cdebootstrap (FIXME)"
 	exit 1
 fi
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index a32c491..d7b807f 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -131,6 +131,6 @@ then
 	# Creating stage file
 	Create_stagefile .stage/bootstrap
 else
-	echo "E: Can't process file /usr/bin/debootstrap (FIXME)"
+	Echo_error "Can't process file /usr/bin/debootstrap (FIXME)"
 	exit 1
 fi
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt
index 47107e7..cecd8ab 100755
--- a/helpers/lh_chroot_apt
+++ b/helpers/lh_chroot_apt
@@ -36,24 +36,18 @@ Breakpoint "chroot_apt: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
 case "${1}" in
 	install)
 		# Checking stage file
 		Check_stagefile .stage/chroot_apt
 
-		if [ -f chroot/etc/apt/apt.conf ]
-		then
-			# Remove old /etc/apt/apt.conf
-			rm -f chroot/etc/apt/apt.conf
-		fi
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
 
-		if [ "${LH_APT}" = "aptitude" ] && [ ! -d chroot/etc/apt/apt.conf.d ]
+		if [ ! -d chroot/etc/apt/apt.conf.d ]
 		then
 			mkdir -p chroot/etc/apt/apt.conf.d
 		fi
@@ -61,125 +55,76 @@ case "${1}" in
 		# Configuring apt ftp proxy
 		if [ -n "${LH_APT_FTPPROXY}" ]
 		then
-			case "${LH_APT}" in
-				apt|apt-get)
-					echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" >> chroot/etc/apt/apt.conf
-					;;
-
-				aptitude)
-					echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" > chroot/etc/apt/apt.conf.d/ftp-proxy
-					;;
-			esac
+			echo "Acquire::ftp::Proxy \"${LH_APT_FTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
 		fi
 
 		# Configuring apt http proxy
 		if [ -n "${LH_APT_HTTPPROXY}" ]
 		then
-			case "${LH_APT}" in
-				apt|apt-get)
-					echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" >> chroot/etc/apt/apt.conf
-					;;
-
-				aptitude)
-					echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" > chroot/etc/apt/apt.conf.d/http-proxy
-					;;
-			esac
+			echo "Acquire::http::Proxy \"${LH_APT_HTTPPROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
 		fi
 
 		# Configuring apt pdiffs
-		if [ "${LH_APT_PDIFFS}" = "enabled" ]
-		then
-			case "${LH_APT}" in
-				apt|apt-get)
-		                        echo "Acquire::PDiffs \"true\";" >> chroot/etc/apt/apt.conf
-					;;
-
-				aptitude)
-					echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/pdiffs
-					;;
-			esac
-		else
-			case "${LH_APT}" in
-				apt|apt-get)
-		                        echo "Acquire::PDiffs \"false\";" >> chroot/etc/apt/apt.conf
-					;;
+		case "${LH_APT_PDIFFS}" in
+			enabled)
+				echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs
+				;;
 
-				aptitude)
-					echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/pdiffs
-					;;
-			esac
-		fi
+			disabled)
+				echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs
+				;;
+		esac
 
 		# Configuring apt recommends
-		if [ "${LH_APT_RECOMMENDS}" = "enabled" ]
+		if [ "${LH_APT}" = "aptitude" ]
 		then
-			case "${LH_APT}" in
-				apt|apt-get)
-		                        echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf
+			case "${LH_APT_RECOMMENDS}" in
+				enabled)
+					echo "Aptitude::Recommends-Important \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
 					;;
 
-				aptitude)
-					echo "Aptitude::Recommends-Important \"true\";" > chroot/etc/apt/apt.conf.d/recommends
-					;;
-			esac
-		else
-			case "${LH_APT}" in
-				apt|apt-get)
-		                        echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf
-					;;
-
-				aptitude)
-					echo "Aptitude::Recommends-Important \"false\";" > chroot/etc/apt/apt.conf.d/recommends
+				disabled)
+					echo "Aptitude::Recommends-Important \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
 					;;
 			esac
 		fi
 
 		# Configuring apt secure
-		if [ "${LH_APT_SECURE}" = "enabled" ]
-		then
-			case "${LH_APT}" in
-				apt|apt-get)
-		                        echo "APT::Get::AllowUnauthenticated \"true\";" >> chroot/etc/apt/apt.conf
-					;;
+		case "${LH_APT_SECURE}" in
+			enabled)
+				echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
+				;;
 
-				aptitude)
-					echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/secure
-					;;
-			esac
-		else
-			case "${LH_APT}" in
-				apt|apt-get)
-		                        echo "APT::Get::AllowUnauthenticated \"false\";" >> chroot/etc/apt/apt.conf
-					;;
-
-				aptitude)
-					echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/secure
-					;;
-			esac
-		fi
+			disabled)
+				echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
+				;;
+		esac
 
 		# Creating stage file
 		Create_stagefile .stage/chroot_apt
 		;;
 
 	remove)
-		# Deconfiguring apt settings
-		rm -f chroot/etc/apt/apt.conf
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
 
 		# Deconfiguring aptitude ftp proxy
-		rm -f chroot/etc/apt/apt.conf.d/ftp-proxy
+		rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
 
 		# Deconfiguring aptitude http proxy
-		rm -f chroot/etc/apt/apt.conf.d/http-proxy
+		rm -f chroot/etc/apt/apt.conf.d/00http-proxy
 
 		# Deconfiguring aptitude pdiffs
-		rm -f chroot/etc/apt/apt.conf.d/pdiffs
+		rm -f chroot/etc/apt/apt.conf.d/00pdiffs
 
 		# Deconfiguring aptitude recommends
-		rm -f chroot/etc/apt/apt.conf.d/recommends
+		rm -f chroot/etc/apt/apt.conf.d/00recommends
 
 		# Deconfiguring aptitude secure
-		rm -f chroot/etc/apt/apt.conf.d/secure
+		rm -f chroot/etc/apt/apt.conf.d/00secure
 
 		# Removing stage file
 		rm -f .stage/chroot_apt
diff --git a/helpers/lh_chroot_debianchroot b/helpers/lh_chroot_debianchroot
index b0f3a57..bc83028 100755
--- a/helpers/lh_chroot_debianchroot
+++ b/helpers/lh_chroot_debianchroot
@@ -36,17 +36,17 @@ Breakpoint "chroot_debianchroot: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
 case "${1}" in
 	install)
 		# Checking stage file
 		Check_stagefile .stage/chroot_debianchroot
 
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ -f chroot/etc/debian_chroot ]
 		then
 			# Save chroot file
@@ -61,6 +61,12 @@ case "${1}" in
 		;;
 
 	remove)
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ -f chroot/etc/debian_chroot.orig ]
 		then
 			# Restore chroot file
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index 85386a8..d2fac35 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -66,3 +66,8 @@ then
 	# Creating stage file
 	Create_stagefile .stage/chroot_hooks
 fi
+
+if [ -n "${LIVE_HOOKS}" ]
+then
+	LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" LIVE_DEBCONF_NOWARNINGS="no" Chroot "${LIVE_HOOKS}"
+fi
diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts
index 52784d5..4262f60 100755
--- a/helpers/lh_chroot_hosts
+++ b/helpers/lh_chroot_hosts
@@ -36,17 +36,17 @@ Breakpoint "chroot_hosts: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
 case "${1}" in
 	install)
 		# Checking stage file
 		Check_stagefile .stage/chroot_hosts
 
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ -f chroot/etc/hosts ]
 		then
 			# Save hosts file
@@ -64,6 +64,12 @@ case "${1}" in
 		;;
 
 	remove)
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ -f chroot/etc/hosts.orig ]
 		then
 			# Restore hosts file
diff --git a/helpers/lh_chroot_interactive b/helpers/lh_chroot_interactive
index ac90f89..556f079 100755
--- a/helpers/lh_chroot_interactive
+++ b/helpers/lh_chroot_interactive
@@ -33,40 +33,37 @@ Set_defaults
 
 Breakpoint "chroot_interactive: Init"
 
-if [ "${LIVE_INTERACTIVE}" != "disabled" ]
+if [ "${LIVE_INTERACTIVE}" = "disabled" ]
 then
-	# Requiring stage file
-	Require_stagefile .stage/bootstrap
+	exit 0
+fi
 
-	# Checking lock file
-	Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/bootstrap
 
-	# Creating lock file
-	Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/chroot_interactive
 
-	# Checking stage file
-	Check_stagefile .stage/chroot_interactive
+# Checking lock file
+Check_lockfile .lock
 
-	case "${LIVE_INTERACTIVE}" in
-		enabled|shell)
-			echo "Pausing build: starting interactive shell..."
+# Creating lock file
+Create_lockfile .lock
 
+case "${LIVE_INTERACTIVE}" in
+	enabled|shell)
+		echo "Pausing build: starting interactive shell..."
 			Chroot "/bin/bash --login"
-			;;
-
+		;;
 		x11)
-			echo "Pausing build: starting interactive X11..."
-
+		echo "Pausing build: starting interactive X11..."
 			Chroot "startx"
-			;;
-
+		;;
 		xnest)
-			echo "Pausing build: starting interactive Xnest..."
-
+		echo "Pausing build: starting interactive Xnest..."
 			#Chroot "" # FIXME
-			;;
-	esac
+		;;
+esac
 
-	# Creating stage file
-	Create_stagefile .stage/chroot_symlinks
-fi
+# Creating stage file
+Create_stagefile .stage/chroot_symlinks
diff --git a/helpers/lh_chroot_linuximage b/helpers/lh_chroot_linuximage
index 0af6e18..e3d3786 100755
--- a/helpers/lh_chroot_linuximage
+++ b/helpers/lh_chroot_linuximage
@@ -36,17 +36,17 @@ Breakpoint "chroot_linuximage: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
 case "${1}" in
 	install)
 		# Checking stage file
 		Check_stagefile .stage/chroot_linuximage
 
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ -f chroot/etc/kernel-img.conf ]
 		then
 			# Saving kernel-img.conf
@@ -54,7 +54,11 @@ case "${1}" in
 		fi
 
 		# Configuring kernel-img.conf
-		echo "do_initrd = Yes"  >> chroot/etc/kernel-img.conf
+cat >> chroot/etc/kernel-img.conf << EOF
+do_bootloader = No
+do_initrd = Yes
+warn_initrd = No
+EOF
 
 		if [ "${LIVE_KERNEL_PACKAGES}" != "none" ]
 		then
@@ -85,6 +89,12 @@ case "${1}" in
 		;;
 
 	remove)
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ -f chroot/etc/kernel-img.conf.old ]
 		then
 			# Restoring kernel-img.conf file
diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc
index b689cc6..42a7feb 100755
--- a/helpers/lh_chroot_proc
+++ b/helpers/lh_chroot_proc
@@ -39,17 +39,17 @@ Breakpoint "chroot_proc: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
 case "${1}" in
 	install)
 		# Checking stage file
 		Check_stagefile .stage/chroot_proc
 
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ ! -d chroot/proc ]
 		then
 			# Creating mountpoint
@@ -64,8 +64,17 @@ case "${1}" in
 		;;
 
 	remove)
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		# Workaround binfmt-support /proc locking
-		umount chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
+		if [ -e chroot/proc/sys/fs/binftm_misc/status ]
+		then
+			umount chroot/proc/sys/fs/binfmt_misc
+		fi
 
 		# Unmounting /proc
 		#fuser -km chroot/proc
diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv
index db68e8c..71143f2 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -36,17 +36,17 @@ Breakpoint "chroot_resolv: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
 case "${1}" in
 	install)
 		# Checking stage file
 		Check_stagefile .stage/chroot_resolv
 
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ -f chroot/etc/resolv.conf ]
 		then
 			# Save resolv file
@@ -64,6 +64,12 @@ case "${1}" in
 		;;
 
 	remove)
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ -f chroot/etc/resolv.conf.orig ]
 		then
 			# Restore resolv file
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index af85217..c4a3a51 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -36,17 +36,17 @@ Breakpoint "chroot_sources: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
 case "${1}" in
 	install)
 		# Checking stage file
 		Check_stagefile .stage/chroot_sources
 
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		# Configure custom sources.list
 		echo "deb ${LIVE_MIRROR_BUILD} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
 
@@ -57,7 +57,7 @@ case "${1}" in
 
 		if [ "${LIVE_SECURITY}" = "enabled" ]
 		then
-			if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" = "unstable" ]
+			if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
 			then
 				echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 
@@ -76,7 +76,7 @@ case "${1}" in
 
 			for FILE in config/chroot_sources/*.build
 			do
-				cat ${FILE} >> chroot/etc/apt/sources.list
+				cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
 			done
 		fi
 
@@ -103,7 +103,7 @@ case "${1}" in
 		fi
 
 		# Installing aptitude
-		if [ "${LH_APT}" = "apt" ]
+		if [ "${LH_APT}" = "apt" ] || [ "${LH_APT}" = "apt-get" ]
 		then
 			Chroot "apt-get update"
 		elif [ "${LH_APT}" = "aptitude" ]
@@ -129,6 +129,12 @@ case "${1}" in
 		;;
 
 	remove)
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		# Configure generic indices
 		if [ "${LH_APT_GENERIC}" = "enabled" ]
 		then
@@ -169,9 +175,9 @@ case "${1}" in
 				echo "" >> chroot/etc/apt/sources.list
 				echo "# Custom repositories" >> chroot/etc/apt/sources.list
 
-				for FILE in config/chroot_sources/*.image
+				for FILE in config/chroot_sources/*.build
 				do
-					cat ${FILE} >> chroot/etc/apt/sources.list
+					cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
 				done
 			fi
 
diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks
index a2413e5..e574480 100755
--- a/helpers/lh_chroot_symlinks
+++ b/helpers/lh_chroot_symlinks
@@ -36,15 +36,15 @@ Breakpoint "chroot_symlinks: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/chroot_symlinks
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/chroot_symlinks
-
 if [ "${LIVE_SYMLINKS}" = "enabled" ]
 then
 	if [ -f chroot/usr/bin/symlinks ]
diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs
index ae9c0b4..539a793 100755
--- a/helpers/lh_chroot_sysfs
+++ b/helpers/lh_chroot_sysfs
@@ -39,17 +39,17 @@ Breakpoint "chroot_sysfs: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
 case "${1}" in
 	install)
 		# Checking stage file
 		Check_stagefile .stage/chroot_sysfs
 
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ ! -d chroot/sys ]
 		then
 			# Create mountpoint
@@ -64,6 +64,12 @@ case "${1}" in
 		;;
 
 	remove)
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		# Unmounting /sys
 		#fuser -km chroot/sys
 		umount chroot/sys > /dev/null 2>&1
diff --git a/helpers/lh_chroot_sysvinit b/helpers/lh_chroot_sysvinit
index 48eae43..4cee00b 100755
--- a/helpers/lh_chroot_sysvinit
+++ b/helpers/lh_chroot_sysvinit
@@ -36,15 +36,15 @@ Breakpoint "chroot_sysvinit: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
+# Checking stage file
+Check_stagefile .stage/chroot_sysvinit
+
 # Checking lock file
 Check_lockfile .lock
 
 # Creating lock file
 Create_lockfile .lock
 
-# Checking stage file
-Check_stagefile .stage/chroot_sysvinit
-
 if [ "${LIVE_SYSVINIT}" = "enabled" ]
 then
 	# Disable all
diff --git a/helpers/lh_chroot_sysvrc b/helpers/lh_chroot_sysvrc
index f864854..8913236 100755
--- a/helpers/lh_chroot_sysvrc
+++ b/helpers/lh_chroot_sysvrc
@@ -36,17 +36,17 @@ Breakpoint "chroot_sysvrc: Init"
 # Requiring stage file
 Require_stagefile .stage/bootstrap
 
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
 case "${1}" in
 	install)
 		# Checking stage file
 		Check_stagefile .stage/chroot_sysvrc
 
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ -f chroot/usr/sbin/policy-rc.d ]
 		then
 			# Save policy-rc.d file
@@ -70,6 +70,12 @@ EOF
 		;;
 
 	remove)
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
 		if [ -f chroot/usr/sbin/policy-rc.d.orig ]
 		then
 			# Restore policy-rc.d file
diff --git a/helpers/lh_clean b/helpers/lh_clean
index dde83d5..10118f5 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -58,7 +58,7 @@ case "${1}" in
 		umount -f chroot/dev/pts > /dev/null 2>&1 || true
 		umount -f chroot/dev > /dev/null 2>&1 || true
 
-		rm -rf chroot
+		rm -rf chroot chroot.tmp
 
 		if [ "${PURGE}" != "true" ] && [ -d cache/chroot_bootstrap ]
 		then
@@ -98,6 +98,7 @@ case "${1}" in
 	source)
 		rm -f source.iso
 		rm -f source.img
+		rm -f source*.tar
 		rm -f source*.tar.gz
 
 		rm -rf source
diff --git a/helpers/lh_config b/helpers/lh_config
index 0d42477..13c1835 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -22,9 +22,25 @@ USAGE="${PROGRAM} [--force]"
 
 Arguments "${@}"
 
+CONFIG="${1}"
+
 Echo_debug "Init ${PROGRAM}"
 
-if [ "${1}" != "newconfig" ]
+if [ -n "${LH_CONFIG}" ]
+then
+	if [ -d /usr/share/live-helper/configs/"${LH_CONFIG}" ]
+	then
+		mkdir "${LH_CONFIG}"
+		cp -r /usr/share/live-helper/configs/"${LH_CONFIG}" "${LH_CONFIG}"/config
+
+		LIVE_ROOT="${LH_CONFIG}"
+		CONFIG=""
+	else
+		Echo_error "Couldn't find config ${LH_CONFIG} in /usr/share/live-helper/configs/."
+	fi
+fi
+
+if [ "${CONFIG}" != "newconfig" ]
 then
 	# Source existing configuration
 	Read_conffile "${LIVE_ROOT}"/config/common
@@ -39,7 +55,7 @@ Set_defaults
 Breakpoint "config: Init"
 
 # Creating configuration directory
-install -d -m 0755 "${LIVE_ROOT}"/config || true
+mkdir -p "${LIVE_ROOT}"/config
 
 # Creating live-helper configuration
 cat > "${LIVE_ROOT}"/config/common << EOF
@@ -93,6 +109,10 @@ LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
 # (Default: ${LH_DEBCONF_PRIORITY})
 LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
 
+# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
+# (Default: ${LH_DEBCONF_NOWARNINGS})
+LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
+
 # \$LH_GENISOIMAGE: set the genisoimage program
 # (Default: ${LH_GENISOIMAGE})
 LH_GENISOIMAGE="${LH_GENISOIMAGE}"
@@ -144,6 +164,10 @@ LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}"
 # (Default: empty)
 LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}"
 
+# \$LIVE_HOOKS: set hook commands
+# (Default: empty)
+LIVE_HOOKS="${LIVE_HOOKS}"
+
 # \$LIVE_LANGUAGE: set the language to use
 # (Default: empty)
 LIVE_LANGUAGE="${LIVE_LANGUAGE}"
@@ -178,11 +202,11 @@ LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
 EOF
 
 # Creating lh_chroot_* directories
-install -d -m 0755 "${LIVE_ROOT}"/config/chroot_localhooks || true
-install -d -m 0755 "${LIVE_ROOT}"/config/chroot_localincludes || true
-install -d -m 0755 "${LIVE_ROOT}"/config/chroot_localpackages || true
-install -d -m 0755 "${LIVE_ROOT}"/config/chroot_localpackageslists || true
-install -d -m 0755 "${LIVE_ROOT}"/config/chroot_sources || true
+mkdir -p "${LIVE_ROOT}"/config/chroot_localhooks
+mkdir -p "${LIVE_ROOT}"/config/chroot_localincludes
+mkdir -p "${LIVE_ROOT}"/config/chroot_localpackages
+mkdir -p "${LIVE_ROOT}"/config/chroot_localpackageslists
+mkdir -p "${LIVE_ROOT}"/config/chroot_sources
 
 # Creating lh_bootstrap_* configuration
 cat > "${LIVE_ROOT}"/config/bootstrap << EOF
@@ -249,9 +273,9 @@ LIVE_HOSTNAME="${LIVE_HOSTNAME}"
 # (Default: ${LIVE_FILESYSTEM})
 LIVE_FILESYSTEM="${LIVE_FILESYSTEM}"
 
-# \$LIVE_MEMTEST86: set memtest86+
-# (Default: ${LIVE_MEMTEST86})
-LIVE_MEMTEST86="${LIVE_MEMTEST86}"
+# \$LIVE_MEMTEST: set memtest
+# (Default: ${LIVE_MEMTEST})
+LIVE_MEMTEST="${LIVE_MEMTEST}"
 
 # \$LIVE_ISO_VOLUME: set iso volume
 # (Default: ${LIVE_ISO_VOLUME})
@@ -299,4 +323,4 @@ LIVE_TEMPLATES="${LIVE_TEMPLATES}"
 EOF
 
 # Creating lh_binary_* directories
-install -d -m 0755 "${LIVE_ROOT}"/config/binary_localincludes || true
+mkdir -p "${LIVE_ROOT}"/config/binary_localincludes
diff --git a/helpers/lh_source_config b/helpers/lh_source_config
index 3982696..5b549be 100755
--- a/helpers/lh_source_config
+++ b/helpers/lh_source_config
@@ -33,38 +33,40 @@ Set_defaults
 
 Breakpoint "source_config: Init"
 
-if [ "${LIVE_SOURCE}" = "enabled" ]
+if [ "${LIVE_SOURCE}" != "enabled" ]
 then
-	# Requiring stage file
-	Require_stagefile .stage/bootstrap
+	exit 0
+fi
 
-	# Checking lock file
-	Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/bootstrap
 
-	# Creating lock file
-	Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/source_config
 
-	# Checking stage file
-	Check_stagefile .stage/source_config
+# Checking lock file
+Check_lockfile .lock
 
-	# Remove old sources
-	if [ -d source/debian-live ]
-	then
-		rm -rf source/debian-live
-	fi
+# Creating lock file
+Create_lockfile .lock
 
-	# Copy system configuration
-	mkdir -p source/debian-live
-	cp -a config source/debian-live
+# Remove old sources
+if [ -d source/debian-live ]
+then
+	rm -rf source/debian-live
+fi
 
-	# Create tarball
-	cd source
-	tar cfz debian-live-config_`date +%Y%m%d.%s`.tar.gz debian-live
-	cd "${OLDPWD}"
+# Copy system configuration
+mkdir -p source/debian-live
+cp -a config source/debian-live
 
-	rm -rf source/debian-live/config
-	mv source/debian-live-config_*.tar.gz source/debian-live
+# Create tarball
+cd source
+tar cfz debian-live-config_`date +%Y%m%d.%s`.tar.gz debian-live
+cd "${OLDPWD}"
 
-	# Creating stage file
-	Create_stagefile .stage/source_config
-fi
+rm -rf source/debian-live/config
+mv source/debian-live-config_*.tar.gz source/debian-live
+
+# Creating stage file
+Create_stagefile .stage/source_config
diff --git a/helpers/lh_source_download b/helpers/lh_source_download
index a3ec267..d9f0adf 100755
--- a/helpers/lh_source_download
+++ b/helpers/lh_source_download
@@ -33,51 +33,57 @@ Set_defaults
 
 Breakpoint "source_download: Init"
 
-if [ "${LIVE_SOURCE}" = "enabled" ]
+if [ "${LIVE_SOURCE}" != "enabled" ]
 then
-	# Requiring stage file
-	Require_stagefile .stage/bootstrap
-
-	# Checking lock file
-	Check_lockfile .lock
-
-	# Creating lock file
-	Create_lockfile .lock
-
-	# Checking stage file
-	Check_stagefile .stage/source_download
-
-	# Remove old sources
-	if [ -d source/debian ]
-	then
-		rm -rf source/debian
-	fi
-
-	# Download sources
-	Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
-	#echo "live-helper" >> chroot/root/dpkg-selection.txt
-	Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only"
-	rm -f chroot/root/dpkg-selection.txt
-
-	# Sort sources
-	for DSC in chroot/*.dsc
-	do
-		SOURCE="`awk '/Source:/ { print $2; }' ${DSC}`"
-
-		if [ "`echo ${SOURCE} | cut -b 1-3`" == "lib" ]
-		then
-			LETTER="`echo ${SOURCE} | cut -b 1-4`"
-		else
-			LETTER="`echo ${SOURCE} | cut -b 1`"
-		fi
-
-		# Install directory
-		install -d -m 0755 source/debian/"${LETTER}"/"${SOURCE}"
-
-		# Move files
-		mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}"
-	done
-
-	# Creating stage file
-	Create_stagefile .stage/source_download
+	exit 0
 fi
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/source_download
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old sources
+if [ -d source/debian ]
+then
+	rm -rf source/debian
+fi
+
+# Download sources
+Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
+echo "${LIVE_BOOTLOADER}" >> chroot/root/dpkg-selection.txt
+#echo "live-helper" >> chroot/root/dpkg-selection.txt
+Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only"
+rm -f chroot/root/dpkg-selection.txt
+
+# Sort sources
+for DSC in chroot/*.dsc
+do
+	SOURCE="`sed  -n 's/^Source: //p' ${DSC}`"
+
+	case "${SOURCE}" in
+		lib?*)
+			LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+			;;
+
+		*)
+			LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+			;;
+	esac
+
+	# Install directory
+	mkdir -p source/debian/"${LETTER}"/"${SOURCE}"
+
+	# Move files
+	mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}"
+done
+
+# Creating stage file
+Create_stagefile .stage/source_download
diff --git a/helpers/lh_source_generic b/helpers/lh_source_generic
index 3740fe3..0ffa9fc 100755
--- a/helpers/lh_source_generic
+++ b/helpers/lh_source_generic
@@ -33,7 +33,7 @@ Set_defaults
 
 Breakpoint "source_generic: Init"
 
-if [ "${LIVE_SOURCE}" = "disabled" ]
+if [ "${LIVE_SOURCE}" != "enabled" ]
 then
 	exit 0
 fi
@@ -45,15 +45,15 @@ do
 		# Requiring stage file
 		Require_stagefile .stage/source_download
 
+		# Checking stage file
+		Check_stagefile .stage/source_generic
+
 		# Checking lock file
 		Check_lockfile .lock
 
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Checking stage file
-		Check_stagefile .stage/source_generic
-
 		# Remove old source
 		if [ -f source.tar ]
 		then
diff --git a/helpers/lh_source_hdd b/helpers/lh_source_hdd
index a3bdd8c..1c8c88b 100755
--- a/helpers/lh_source_hdd
+++ b/helpers/lh_source_hdd
@@ -33,7 +33,7 @@ Set_defaults
 
 Breakpoint "source_hdd: Init"
 
-if [ "${LIVE_SOURCE}" = "disabled" ]
+if [ "${LIVE_SOURCE}" != "enabled" ]
 then
 	exit 0
 fi
@@ -45,15 +45,15 @@ do
 		# Requiring stage file
 		Require_stagefile .stage/source_download
 
+		# Checking stage file
+		Check_stagefile .stage/source_hdd
+
 		# Checking lock file
 		Check_lockfile .lock
 
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Checking stage file
-		Check_stagefile .stage/source_hdd
-
 		# Remove old source
 		if [ -f source-hdd.tar.gz ]
 		then
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index f5b18cc..f69b705 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -33,7 +33,7 @@ Set_defaults
 
 Breakpoint "source_iso: Init"
 
-if [ "${LIVE_SOURCE}" = "disabled" ]
+if [ "${LIVE_SOURCE}" != "enabled" ]
 then
 	exit 0
 fi
@@ -45,15 +45,15 @@ do
 		# Requiring stage file
 		Require_stagefile .stage/source_download
 
+		# Checking stage file
+		Check_stagefile .stage/source_iso
+
 		# Checking lock file
 		Check_lockfile .lock
 
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Checking stage file
-		Check_stagefile .stage/source_iso
-
 		# Remove old source
 		if [ -f source.iso ]
 		then
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index 8fc2b39..e175663 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -33,31 +33,33 @@ Set_defaults
 
 Breakpoint "source_md5sum: Init"
 
-if [ "${LIVE_SOURCE}" = "enabled" ]
+if [ "${LIVE_SOURCE}" != "enabled" ]
 then
-	# Requiring stage file
-	Require_stagefile .stage/source_download
-
-	# Checking lock file
-	Check_lockfile .lock
+	exit 0
+fi
 
-	# Creating lock file
-	Create_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/source_download
 
-	# Checking stage file
-	Check_stagefile .stage/source_md5sum
+# Checking stage file
+Check_stagefile .stage/source_md5sum
 
-	# Remove old md5sums
-	if [ -f source/md5sum.txt ]
-	then
-		rm -f source/md5sum.txt
-	fi
+# Checking lock file
+Check_lockfile .lock
 
-	# Calculating md5sums
-	cd source
-	find . -type f -print0 | xargs -0 md5sum > md5sum.txt
-	cd "${OLDPWD}"
+# Creating lock file
+Create_lockfile .lock
 
-	# Creating stage file
-	Create_stagefile .stage/source_md5sum
+# Remove old md5sums
+if [ -f source/md5sum.txt ]
+then
+	rm -f source/md5sum.txt
 fi
+
+# Calculating md5sums
+cd source
+find . -type f -print0 | xargs -0 md5sum > md5sum.txt
+cd "${OLDPWD}"
+
+# Creating stage file
+Create_stagefile .stage/source_md5sum
diff --git a/helpers/lh_source_net b/helpers/lh_source_net
index a149d5c..67ed8fa 100755
--- a/helpers/lh_source_net
+++ b/helpers/lh_source_net
@@ -33,7 +33,7 @@ Set_defaults
 
 Breakpoint "source_net: Init"
 
-if [ "${LIVE_SOURCE}" = "disabled" ]
+if [ "${LIVE_SOURCE}" != "enabled" ]
 then
 	exit 0
 fi
@@ -45,15 +45,15 @@ do
 		# Requiring stage file
 		Require_stagefile .stage/source_download
 
+		# Checking stage file
+		Check_stagefile .stage/source_net
+
 		# Checking lock file
 		Check_lockfile .lock
 
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Checking stage file
-		Check_stagefile .stage/source_net
-
 		# Remove old source
 		if [ -f source-net.tar.gz ]
 		then
diff --git a/helpers/lh_source_usb b/helpers/lh_source_usb
index bec69e0..178a558 100755
--- a/helpers/lh_source_usb
+++ b/helpers/lh_source_usb
@@ -33,7 +33,7 @@ Set_defaults
 
 Breakpoint "source_usb: Init"
 
-if [ "${LIVE_SOURCE}" = "disabled" ]
+if [ "${LIVE_SOURCE}" != "enabled" ]
 then
 	exit 0
 fi
@@ -45,15 +45,15 @@ do
 		# Requiring stage file
 		Require_stagefile .stage/source_download
 
+		# Checking stage file
+		Check_stagefile .stage/source_usb
+
 		# Checking lock file
 		Check_lockfile .lock
 
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Checking stage file
-		Check_stagefile .stage/source_usb
-
 		if [ ! -f chroot/sbin/mkdosfs ]
 		then
 			PACKAGES="${PACKAGES} dosfstools"
diff --git a/helpers/make-live b/helpers/make-live
index d92bebc..29a6067 100755
--- a/helpers/make-live
+++ b/helpers/make-live
@@ -31,13 +31,13 @@ done
 # Set static variables
 PROGRAM="`basename ${0}`"
 DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution testing|unstable|etch|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-build URL] [--mirror-build-security URL] [--mirror-image URL] [--mirror-image-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest86 enabled|disabled] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb|net] [-s|--source-image generic|hdd|iso|usb|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose]"
+USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution testing|unstable|etch|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-build URL] [--mirror-build-security URL] [--mirror-image URL] [--mirror-image-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb|net] [-s|--source-image generic|hdd|iso|usb|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose]"
 
 HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
 
 Local_arguments ()
 {
-	ARGUMENTS="`getopt --longoptions mode:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,genisoimage:,losetup:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-local:,mirror-local-security:,mirror-generic:,mirror-generic-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest86:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
+	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-build:,mirror-build-security:,mirror-image:,mirror-image-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
 
 	if [ "${?}" != "0" ]
 	then
@@ -60,6 +60,10 @@ Local_arguments ()
 				LH_MODE="${2}"; shift 2
 				;;
 
+			--config)
+				LH_CONFIG="${2}"; shift 2
+				;;
+
 			--apt)
 				LH_APT="${2}"; shift 2
 				;;
@@ -104,6 +108,10 @@ Local_arguments ()
 				LH_DEBCONF_PRIORITY="${2}"; shift 2
 				;;
 
+			--debconf-nowarnings)
+				LH_DEBCONF_NOWARNINGS="${2}"; shift 2
+				;;
+
 			--genisoimage)
 				LH_GENISOIMAGE="${2}"; shift 2
 				;;
@@ -171,6 +179,10 @@ Local_arguments ()
 				LIVE_KEYRING_PACKAGS="${2}"; shift 2
 				;;
 
+			--hooks)
+				LIVE_HOOKS="${2}"; shift 2
+				;;
+
 			-l|--language)
 				LIVE_LANGUAGE="${2}"; shift 2
 				;;
@@ -220,8 +232,8 @@ Local_arguments ()
 				LIVE_FILESYSTEM="${2}"; shift 2
 				;;
 
-			--memtest86)
-				LIVE_MEMTEST86="${2}"; shift 2
+			--memtest)
+				LIVE_MEMTEST="${2}"; shift 2
 				;;
 
 			--iso-volume)
@@ -333,7 +345,7 @@ Main ()
 	Local_arguments "${@}"
 
 	# Configuring (this is really shit!)
-	LH_MODE="${LH_MODE}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" 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_GENISOIMAGE="${LH_GENISOIMAGE}" 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_BUILD="${LIVE_MIRROR_BUILD}" LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" 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_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST86="${LIVE_MEMTEST86}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" 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}" LH_APT_GENERIC="${LH_APT_GENERIC}" 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}" 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_BUILD="${LIVE_MIRROR_BUILD}" LIVE_MIRROR_BUILD_SECURITY="${LIVE_MIRROR_BUILD_SECURITY}" LIVE_MIRROR_IMAGE="${LIVE_MIRROR_IMAGE}" LIVE_MIRROR_IMAGE_SECURITY="${LIVE_MIRROR_IMAGE_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}" LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_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_FILESYSTEM="${LIVE_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_SERVER_ADDRESS="${LIVE_SERVER_ADDRESS}" LIVE_SERVER_PATH="${LIVE_SERVER_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}" LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" lh_config newconfig
 
 	if [ "${LH_BREAKPOINTS}" = "enabled" ]
 	then
diff --git a/hooks/mini b/hooks/mini
index a0982d2..14f942a 100755
--- a/hooks/mini
+++ b/hooks/mini
@@ -15,6 +15,8 @@ apt-get remove --purge --yes man-db manpages info
 apt-get remove --purge --yes ssl wget
 
 # Removing unused files
+find . -name *~ | xargs rm -f
+
 rm -rf /usr/include/*
 #rm -rf /usr/share/groff/*
 rm -rf /usr/share/doc/*
diff --git a/hooks/minimal b/hooks/minimal
index cfb3ab2..c5bb412 100755
--- a/hooks/minimal
+++ b/hooks/minimal
@@ -15,6 +15,8 @@ apt-get remove --purge --yes man-db manpages info
 apt-get remove --purge --yes ssl wget
 
 # Removing unused files
+find . -name *~ | xargs rm -f
+
 rm -rf /var/cache/man/*
 
 # Cleaning apt
diff --git a/includes/common/doc/FAQ/debian-faq.en.html.tar.gz b/includes/common/doc/FAQ/debian-faq.en.html.tar.gz
deleted file mode 100644
index d85f3d0..0000000
--- a/includes/common/doc/FAQ/debian-faq.en.html.tar.gz
+++ /dev/null
diff --git a/includes/common/doc/FAQ/debian-faq.en.pdf.gz b/includes/common/doc/FAQ/debian-faq.en.pdf.gz
deleted file mode 100644
index c8aa37b..0000000
--- a/includes/common/doc/FAQ/debian-faq.en.pdf.gz
+++ /dev/null
diff --git a/includes/common/doc/FAQ/debian-faq.en.ps.gz b/includes/common/doc/FAQ/debian-faq.en.ps.gz
deleted file mode 100644
index 86aa67f..0000000
--- a/includes/common/doc/FAQ/debian-faq.en.ps.gz
+++ /dev/null
diff --git a/includes/common/doc/FAQ/debian-faq.en.txt.gz b/includes/common/doc/FAQ/debian-faq.en.txt.gz
deleted file mode 100644
index ecb1b1a..0000000
--- a/includes/common/doc/FAQ/debian-faq.en.txt.gz
+++ /dev/null
diff --git a/includes/common/doc/FAQ/html/index.en.html b/includes/common/doc/FAQ/html/index.en.html
deleted file mode 100644
index 952a225..0000000
--- a/includes/common/doc/FAQ/html/index.en.html
+++ /dev/null
@@ -1,311 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-
-<html>
-
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-
-<title>The Debian GNU/Linux FAQ</title>
-
-</head>
-
-<body>
-
-<p><a name="index"></a></p>
-<hr>
-
-<p>
-[ <a href="ch-faqinfo.en.html">previous</a> ]
-[ <a href="#contents">Contents</a> ]
-[ <a href="ch-basic_defs.en.html">1</a> ]
-[ <a href="ch-getting.en.html">2</a> ]
-[ <a href="ch-compat.en.html">3</a> ]
-[ <a href="ch-software.en.html">4</a> ]
-[ <a href="ch-ftparchives.en.html">5</a> ]
-[ <a href="ch-pkg_basics.en.html">6</a> ]
-[ <a href="ch-pkgtools.en.html">7</a> ]
-[ <a href="ch-uptodate.en.html">8</a> ]
-[ <a href="ch-kernel.en.html">9</a> ]
-[ <a href="ch-customizing.en.html">10</a> ]
-[ <a href="ch-support.en.html">11</a> ]
-[ <a href="ch-contributing.en.html">12</a> ]
-[ <a href="ch-redistrib.en.html">13</a> ]
-[ <a href="ch-nexttime.en.html">14</a> ]
-[ <a href="ch-faqinfo.en.html">15</a> ]
-[ <a href="ch-basic_defs.en.html">next</a> ]
-</p>
-
-<hr>
-
-<h1>
-The Debian GNU/Linux FAQ
-<br></h1>
-
-<hr>
-
-<h2><a name="abstract"></a>Abstract</h2>
-
-<p>
-This document answers questions frequently asked about Debian GNU/Linux.
-</p>
-
-<hr>
-
-<h2><a name="copyright"></a>Copyright Notice</h2>
-
-<p>
-Copyright &copy; 1996-2005 by Software in the Public Interest
-</p>
-
-<p>
-Permission is granted to make and distribute verbatim copies of this document
-provided the copyright notice and this permission notice are preserved on all
-copies.
-</p>
-
-<p>
-Permission is granted to copy and distribute modified versions of this document
-under the conditions for verbatim copying, provided that the entire resulting
-derived work is distributed under the terms of a permission notice identical to
-this one.
-</p>
-
-<p>
-Permission is granted to copy and distribute translations of this document into
-another language, under the above conditions for modified versions, except that
-this permission notice may be included in translations approved by the Free
-Software Foundation instead of in the original English.
-</p>
-
-<hr>
-
-<h2><a name="contents"></a>Contents</h2>
-
-<ul>
-<li><a href="ch-basic_defs.en.html">1 Definitions and overview</a></li>
-<li><ul>
-<li><a href="ch-basic_defs.en.html#s-whatisfaq">1.1 What is this FAQ?</a></li>
-<li><a href="ch-basic_defs.en.html#s-whatisdebian">1.2 What is Debian GNU/Linux?</a></li>
-<li><a href="ch-basic_defs.en.html#s-linux">1.3 OK, now I know what Debian is... what is Linux?!</a></li>
-<li><a href="ch-basic_defs.en.html#s-non-linux">1.4 Does Debian just do GNU/Linux?</a></li>
-<li><a href="ch-basic_defs.en.html#s-difference">1.5 What is the difference between Debian GNU/Linux and other Linux distributions? Why should I choose Debian over some other distribution?</a></li>
-<li><a href="ch-basic_defs.en.html#s-gnu">1.6 How does the Debian project fit in or compare with the Free Software Foundation's GNU project?</a></li>
-<li><a href="ch-basic_defs.en.html#s-pronunciation">1.7 How does one pronounce Debian and what does this word mean?</a></li>
-</ul></li>
-<li><a href="ch-getting.en.html">2 Getting and installing Debian GNU/Linux</a></li>
-<li><ul>
-<li><a href="ch-getting.en.html#s-version">2.1 What is the latest version of Debian?</a></li>
-<li><a href="ch-getting.en.html#s-updatestable">2.2 Are there package upgrades in `stable'?</a></li>
-<li><a href="ch-getting.en.html#s-boot-floppies">2.3 Where/how can I get the Debian installation disks?</a></li>
-<li><a href="ch-getting.en.html#s-cdrom">2.4 How do I install the Debian from CD-ROMs?</a></li>
-<li><a href="ch-getting.en.html#s-cdimage-symlinks">2.5 Why does the official stable released CD-ROM contain symlinks for `frozen' and `unstable'? I thought this CD contains just `stable'!</a></li>
-<li><a href="ch-getting.en.html#s-cdimages">2.6 I have my own CD-writer, are there CD images available somewhere?</a></li>
-<li><a href="ch-getting.en.html#s-floppy">2.7 Can I install it from a pile of floppy disks?</a></li>
-<li><a href="ch-getting.en.html#s-remoteinstall">2.8 Can I get and install Debian directly from a remote Internet site?</a></li>
-</ul></li>
-<li><a href="ch-compat.en.html">3 Compatibility issues</a></li>
-<li><ul>
-<li><a href="ch-compat.en.html#s-arches">3.1 On what hardware architectures/systems does Debian GNU/Linux run?</a></li>
-<li><a href="ch-compat.en.html#s-otherdistribs">3.2 How compatible is Debian with other distributions of Linux?</a></li>
-<li><a href="ch-compat.en.html#s-otherunices">3.3 How source code compatible is Debian with other Unix systems?</a></li>
-<li><a href="ch-compat.en.html#s-otherpackages">3.4 Can I use Debian packages (&quot;.deb&quot; files) on my Red Hat/Slackware/... Linux system? Can I use Red Hat packages (&quot;.rpm&quot; files) on my Debian GNU/Linux system?</a></li>
-<li><a href="ch-compat.en.html#s-libc5">3.5 Is Debian able to run my old libc5 programs?</a></li>
-<li><a href="ch-compat.en.html#s-libc5-compile">3.6 Can Debian be used to compile libc5 programs?</a></li>
-<li><a href="ch-compat.en.html#s-non-debian-programs">3.7 How should I install a non-Debian program?</a></li>
-<li><a href="ch-compat.en.html#s-termcap">3.8 Why can't I compile programs that require libtermcap?</a></li>
-<li><a href="ch-compat.en.html#s-accelx">3.9 Why can't I install AccelX?</a></li>
-<li><a href="ch-compat.en.html#s-motifnls">3.10 Why do my old XFree 2.1 Motif applications crash?</a></li>
-</ul></li>
-<li><a href="ch-software.en.html">4 Software available in the Debian system</a></li>
-<li><ul>
-<li><a href="ch-software.en.html#s-apps">4.1 What types of applications and development software are available for Debian GNU/Linux?</a></li>
-<li><a href="ch-software.en.html#s-softwareauthors">4.2 Who wrote all that software?</a></li>
-<li><a href="ch-software.en.html#s-pkglist">4.3 How can I get a current list of programs that have been packaged for Debian?</a></li>
-<li><a href="ch-software.en.html#s-missing">4.4 What is missing from Debian GNU/Linux?</a></li>
-<li><a href="ch-software.en.html#s-no-devs">4.5 Why do I get &quot;ld: cannot find -lfoo&quot; messages when compiling programs? Why aren't there any libfoo.so files in Debian library packages?</a></li>
-<li><a href="ch-software.en.html#s-java">4.6 (How) Does Debian support Java?</a></li>
-<li><a href="ch-software.en.html#s-isitdebian">4.7 How can I check that I am using a Debian system, and what version is it?</a></li>
-<li><a href="ch-software.en.html#s-nonenglish">4.8 How does Debian support non-English languages?</a></li>
-<li><a href="ch-software.en.html#s-usexports">4.9 What about the US export regulation limitations?</a></li>
-<li><a href="ch-software.en.html#s-pine">4.10 Where is pine?</a></li>
-<li><a href="ch-software.en.html#s-qmail">4.11 Where is qmail/ezmlm/djbdns?</a></li>
-</ul></li>
-<li><a href="ch-ftparchives.en.html">5 The Debian FTP archives</a></li>
-<li><ul>
-<li><a href="ch-ftparchives.en.html#s-dirtree">5.1 What are all those directories at the Debian FTP archives?</a></li>
-<li><a href="ch-ftparchives.en.html#s-dists">5.2 How many Debian distributions are there in the <samp>dists</samp> directory?</a></li>
-<li><a href="ch-ftparchives.en.html#s-codenames">5.3 What are all those names like slink, potato, etc.?</a></li>
-<li><ul>
-<li><a href="ch-ftparchives.en.html#s-oldcodenames">5.3.1 Which other codenames have been used in the past?</a></li>
-<li><a href="ch-ftparchives.en.html#s-sourceforcodenames">5.3.2 Where do these codenames come from?</a></li>
-</ul></li>
-<li><a href="ch-ftparchives.en.html#s-sid">5.4 What about &quot;sid&quot;?</a></li>
-<li><a href="ch-ftparchives.en.html#s-stable">5.5 What does the stable directory contain?</a></li>
-<li><a href="ch-ftparchives.en.html#s-testing">5.6 What does the testing directory contain?</a></li>
-<li><ul>
-<li><a href="ch-ftparchives.en.html#s-frozen">5.6.1 What about &quot;testing&quot;? How is it `frozen'?</a></li>
-</ul></li>
-<li><a href="ch-ftparchives.en.html#s-unstable">5.7 What does the unstable directory contain?</a></li>
-<li><a href="ch-ftparchives.en.html#s-archsections">5.8 What are all those directories inside <samp>dists/stable/main</samp>?</a></li>
-<li><a href="ch-ftparchives.en.html#s-source">5.9 Where is the source code?</a></li>
-<li><a href="ch-ftparchives.en.html#s-pools">5.10 What's in the <samp>pool</samp> directory?</a></li>
-<li><a href="ch-ftparchives.en.html#s-incoming">5.11 What is &quot;incoming&quot;?</a></li>
-<li><a href="ch-ftparchives.en.html#s-ownrepository">5.12 How do I set up my own apt-able repository?</a></li>
-</ul></li>
-<li><a href="ch-pkg_basics.en.html">6 Basics of the Debian package management system</a></li>
-<li><ul>
-<li><a href="ch-pkg_basics.en.html#s-package">6.1 What is a Debian package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-deb-format">6.2 What is the format of a Debian binary package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-pkgname">6.3 Why are Debian package file names so long?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-controlfile">6.4 What is a Debian control file?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-conffile">6.5 What is a Debian conffile?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-maintscripts">6.6 What is a Debian preinst, postinst, prerm, and postrm script?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-priority">6.7 What is an <em>Essential</em> <em>Required</em>, <em>Important</em>, <em>Standard</em>, <em>Optional</em>, or <em>Extra</em> package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-virtual">6.8 What is a Virtual Package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-depends">6.9 What is meant by saying that a package <em>Depends</em>, <em>Recommends</em>, <em>Suggests</em>, <em>Conflicts</em>, <em>Replaces</em> or <em>Provides</em> another package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-pre-depends">6.10 What is meant by Pre-Depends?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-pkgstatus">6.11 What is meant by <em>unknown</em>, <em>install</em>, <em>remove</em> <em>purge</em> and <em>hold</em> in the package status?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-puttingonhold">6.12 How do I put a package on hold?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-sourcepkgs">6.13 How do I install a source package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-sourcebuild">6.14 How do I build binary packages from a source package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-creatingdebs">6.15 How do I create Debian packages myself?</a></li>
-</ul></li>
-<li><a href="ch-pkgtools.en.html">7 The Debian package management tools</a></li>
-<li><ul>
-<li><a href="ch-pkgtools.en.html#s-pkgprogs">7.1 What programs does Debian provide for managing its packages?</a></li>
-<li><ul>
-<li><a href="ch-pkgtools.en.html#s-dpkg">7.1.1 dpkg</a></li>
-<li><a href="ch-pkgtools.en.html#s-apt-get">7.1.2 APT</a></li>
-<li><a href="ch-pkgtools.en.html#s-aptitude">7.1.3 aptitude</a></li>
-<li><a href="ch-pkgtools.en.html#s-dselect">7.1.4 dselect</a></li>
-<li><a href="ch-pkgtools.en.html#s-dpkg-extra">7.1.5 Other package management tools</a></li>
-</ul></li>
-<li><a href="ch-pkgtools.en.html#s-updaterunning">7.2 Debian claims to be able to update a running program; how is this accomplished?</a></li>
-<li><a href="ch-pkgtools.en.html#s-whatpackages">7.3 How can I tell what packages are already installed on a Debian system?</a></li>
-<li><a href="ch-pkgtools.en.html#s-filesearch">7.4 How can I find out what package produced a particular file?</a></li>
-<li><a href="ch-pkgtools.en.html#s-datapackages">7.5 Why doesn't get `foo-data' removed when I uninstall `foo'? How do I make sure old unused library-packages get purged?</a></li>
-</ul></li>
-<li><a href="ch-uptodate.en.html">8 Keeping your Debian system up-to-date</a></li>
-<li><ul>
-<li><a href="ch-uptodate.en.html#s-libc5to6upgrade">8.1 How can I upgrade my Debian 1.3.1 (or earlier) distribution, based on libc5, to 2.0 (or later), based on libc6?</a></li>
-<li><a href="ch-uptodate.en.html#s-howtocurrent">8.2 How can I keep my Debian system current?</a></li>
-<li><ul>
-<li><a href="ch-uptodate.en.html#s-aptitude-upgrade">8.2.1 aptitude</a></li>
-<li><a href="ch-uptodate.en.html#s-apt">8.2.2 apt-get, dselect and apt-cdrom</a></li>
-<li><a href="ch-uptodate.en.html#s-dpkg-ftp">8.2.3 dpkg-ftp</a></li>
-<li><a href="ch-uptodate.en.html#s-mirror">8.2.4 mirror</a></li>
-<li><a href="ch-uptodate.en.html#s-dpkg-mountable">8.2.5 dpkg-mountable</a></li>
-</ul></li>
-<li><a href="ch-uptodate.en.html#s-upgradesingle">8.3 Must I go into single user mode in order to upgrade a package?</a></li>
-<li><a href="ch-uptodate.en.html#s-savedebs">8.4 Do I have to keep all those .deb archive files on my disk?</a></li>
-<li><a href="ch-uptodate.en.html#s-keepingalog">8.5 How can I keep a log of the packages I added to the system? I'd like to know when which package upgrades and removals have occured!</a></li>
-</ul></li>
-<li><a href="ch-kernel.en.html">9 Debian and the kernel</a></li>
-<li><ul>
-<li><a href="ch-kernel.en.html#s-non-debian-kernel">9.1 Can I install and compile a kernel without some Debian-specific tweaking?</a></li>
-<li><a href="ch-kernel.en.html#s-customkernel">9.2 What tools does Debian provide to build custom kernels?</a></li>
-<li><a href="ch-kernel.en.html#s-custombootdisk">9.3 How can I make a custom boot floppy?</a></li>
-<li><a href="ch-kernel.en.html#s-modules">9.4 What special provisions does Debian provide to deal with modules?</a></li>
-<li><a href="ch-kernel.en.html#s-removeoldkernel">9.5 Can I safely de-install an old kernel package, and if so, how?</a></li>
-</ul></li>
-<li><a href="ch-customizing.en.html">10 Customizing your installation of Debian GNU/Linux</a></li>
-<li><ul>
-<li><a href="ch-customizing.en.html#s-papersize">10.1 How can I ensure that all programs use the same paper size?</a></li>
-<li><a href="ch-customizing.en.html#s-hardwareaccess">10.2 How can I provide access to hardware peripherals, without compromising security?</a></li>
-<li><a href="ch-customizing.en.html#s-consolefont">10.3 How do I load a console font on startup the Debian way?</a></li>
-<li><a href="ch-customizing.en.html#s-appdefaults">10.4 How can I configure an X11 program's application defaults?</a></li>
-<li><a href="ch-customizing.en.html#s-booting">10.5 Every distribution seems to have a different boot-up method. Tell me about Debian's.</a></li>
-<li><a href="ch-customizing.en.html#s-custombootscripts">10.6 It looks as if Debian does not use <samp>rc.local</samp> to customize the boot process; what facilities are provided?</a></li>
-<li><a href="ch-customizing.en.html#s-interconffiles">10.7 How does the package management system deal with packages that contain configuration files for other packages?</a></li>
-<li><a href="ch-customizing.en.html#s-divert">10.8 How do I override a file installed by a package, so that a different version can be used instead?</a></li>
-<li><a href="ch-customizing.en.html#s-localpackages">10.9 How can I have my locally-built package included in the list of available packages that the package management system knows about?</a></li>
-<li><a href="ch-customizing.en.html#s-diverse">10.10 Some users like mawk, others like gawk; some like vim, others like elvis; some like trn, others like tin; how does Debian support diversity?</a></li>
-</ul></li>
-<li><a href="ch-support.en.html">11 Getting support for Debian GNU/Linux</a></li>
-<li><ul>
-<li><a href="ch-support.en.html#s-debiandocs">11.1 What other documentation exists on and for a Debian system?</a></li>
-<li><a href="ch-support.en.html#s-onlineresources">11.2 Are there any on-line resources for discussing Debian?</a></li>
-<li><ul>
-<li><a href="ch-support.en.html#s11.2.1">11.2.1 Mailing lists</a></li>
-<li><a href="ch-support.en.html#s11.2.2">11.2.2 Maintainers</a></li>
-<li><a href="ch-support.en.html#s11.2.3">11.2.3 Usenet newsgroups</a></li>
-</ul></li>
-<li><a href="ch-support.en.html#s-searchtools">11.3 Is there a quick way to search for information on Debian GNU/Linux?</a></li>
-<li><a href="ch-support.en.html#s-buglogs">11.4 Are there logs of known bugs?</a></li>
-<li><a href="ch-support.en.html#s-bugreport">11.5 How do I report a bug in Debian?</a></li>
-</ul></li>
-<li><a href="ch-contributing.en.html">12 Contributing to the Debian Project</a></li>
-<li><ul>
-<li><a href="ch-contributing.en.html#s-contrib">12.1 How can I become a Debian software developer?</a></li>
-<li><a href="ch-contributing.en.html#s-contribresources">12.2 How can I contribute resources to the Debian project?</a></li>
-<li><a href="ch-contributing.en.html#s-supportingorganizations">12.3 How can I contribute financially to the Debian project?</a></li>
-<li><ul>
-<li><a href="ch-contributing.en.html#s-SPI">12.3.1 Software in the Public Interest</a></li>
-<li><a href="ch-contributing.en.html#s-FSF">12.3.2 Free Software Foundation</a></li>
-</ul></li>
-</ul></li>
-<li><a href="ch-redistrib.en.html">13 Redistributing Debian GNU/Linux in a commercial product</a></li>
-<li><ul>
-<li><a href="ch-redistrib.en.html#s-sellcds">13.1 Can I make and sell Debian CDs?</a></li>
-<li><a href="ch-redistrib.en.html#s-packagednonfree">13.2 Can Debian be packaged with non-free software?</a></li>
-<li><a href="ch-redistrib.en.html#s-childistro">13.3 I am making a special Linux distribution for a &quot;vertical market&quot;. Can I use Debian GNU/Linux for the guts of a Linux system and add my own applications on top of it?</a></li>
-<li><a href="ch-redistrib.en.html#s-commercialdebs">13.4 Can I put my commercial program in a Debian &quot;package&quot; so that it installs effortlessly on any Debian system?</a></li>
-</ul></li>
-<li><a href="ch-nexttime.en.html">14 Changes expected in the next major release of Debian</a></li>
-<li><ul>
-<li><a href="ch-nexttime.en.html#s-security">14.1 Increased security</a></li>
-<li><a href="ch-nexttime.en.html#s-i18n">14.2 Extended support for non-English users</a></li>
-<li><a href="ch-nexttime.en.html#s-morearches">14.3 More architectures</a></li>
-<li><a href="ch-nexttime.en.html#s-morekernels">14.4 More kernels</a></li>
-</ul></li>
-<li><a href="ch-faqinfo.en.html">15 General information about the FAQ</a></li>
-<li><ul>
-<li><a href="ch-faqinfo.en.html#s-authors">15.1 Authors</a></li>
-<li><a href="ch-faqinfo.en.html#s-feedback">15.2 Feedback</a></li>
-<li><a href="ch-faqinfo.en.html#s-latest">15.3 Availability</a></li>
-<li><a href="ch-faqinfo.en.html#s-docformat">15.4 Document format</a></li>
-</ul></li>
-</ul>
-
-<hr>
-
-<p>
-[ <a href="ch-faqinfo.en.html">previous</a> ]
-[ <a href="#contents">Contents</a> ]
-[ <a href="ch-basic_defs.en.html">1</a> ]
-[ <a href="ch-getting.en.html">2</a> ]
-[ <a href="ch-compat.en.html">3</a> ]
-[ <a href="ch-software.en.html">4</a> ]
-[ <a href="ch-ftparchives.en.html">5</a> ]
-[ <a href="ch-pkg_basics.en.html">6</a> ]
-[ <a href="ch-pkgtools.en.html">7</a> ]
-[ <a href="ch-uptodate.en.html">8</a> ]
-[ <a href="ch-kernel.en.html">9</a> ]
-[ <a href="ch-customizing.en.html">10</a> ]
-[ <a href="ch-support.en.html">11</a> ]
-[ <a href="ch-contributing.en.html">12</a> ]
-[ <a href="ch-redistrib.en.html">13</a> ]
-[ <a href="ch-nexttime.en.html">14</a> ]
-[ <a href="ch-faqinfo.en.html">15</a> ]
-[ <a href="ch-basic_defs.en.html">next</a> ]
-</p>
-
-<hr>
-
-<p>
-The Debian GNU/Linux FAQ
-</p>
-
-<address>
-version 3.1.3, 25 April 2006<br>
-<br>
-Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
-<br>
-</address>
-<hr>
-
-</body>
-
-</html>
-
diff --git a/includes/common/doc/FAQ/html/index.html b/includes/common/doc/FAQ/html/index.html
deleted file mode 100644
index 952a225..0000000
--- a/includes/common/doc/FAQ/html/index.html
+++ /dev/null
@@ -1,311 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-
-<html>
-
-<head>
-
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-
-<title>The Debian GNU/Linux FAQ</title>
-
-</head>
-
-<body>
-
-<p><a name="index"></a></p>
-<hr>
-
-<p>
-[ <a href="ch-faqinfo.en.html">previous</a> ]
-[ <a href="#contents">Contents</a> ]
-[ <a href="ch-basic_defs.en.html">1</a> ]
-[ <a href="ch-getting.en.html">2</a> ]
-[ <a href="ch-compat.en.html">3</a> ]
-[ <a href="ch-software.en.html">4</a> ]
-[ <a href="ch-ftparchives.en.html">5</a> ]
-[ <a href="ch-pkg_basics.en.html">6</a> ]
-[ <a href="ch-pkgtools.en.html">7</a> ]
-[ <a href="ch-uptodate.en.html">8</a> ]
-[ <a href="ch-kernel.en.html">9</a> ]
-[ <a href="ch-customizing.en.html">10</a> ]
-[ <a href="ch-support.en.html">11</a> ]
-[ <a href="ch-contributing.en.html">12</a> ]
-[ <a href="ch-redistrib.en.html">13</a> ]
-[ <a href="ch-nexttime.en.html">14</a> ]
-[ <a href="ch-faqinfo.en.html">15</a> ]
-[ <a href="ch-basic_defs.en.html">next</a> ]
-</p>
-
-<hr>
-
-<h1>
-The Debian GNU/Linux FAQ
-<br></h1>
-
-<hr>
-
-<h2><a name="abstract"></a>Abstract</h2>
-
-<p>
-This document answers questions frequently asked about Debian GNU/Linux.
-</p>
-
-<hr>
-
-<h2><a name="copyright"></a>Copyright Notice</h2>
-
-<p>
-Copyright &copy; 1996-2005 by Software in the Public Interest
-</p>
-
-<p>
-Permission is granted to make and distribute verbatim copies of this document
-provided the copyright notice and this permission notice are preserved on all
-copies.
-</p>
-
-<p>
-Permission is granted to copy and distribute modified versions of this document
-under the conditions for verbatim copying, provided that the entire resulting
-derived work is distributed under the terms of a permission notice identical to
-this one.
-</p>
-
-<p>
-Permission is granted to copy and distribute translations of this document into
-another language, under the above conditions for modified versions, except that
-this permission notice may be included in translations approved by the Free
-Software Foundation instead of in the original English.
-</p>
-
-<hr>
-
-<h2><a name="contents"></a>Contents</h2>
-
-<ul>
-<li><a href="ch-basic_defs.en.html">1 Definitions and overview</a></li>
-<li><ul>
-<li><a href="ch-basic_defs.en.html#s-whatisfaq">1.1 What is this FAQ?</a></li>
-<li><a href="ch-basic_defs.en.html#s-whatisdebian">1.2 What is Debian GNU/Linux?</a></li>
-<li><a href="ch-basic_defs.en.html#s-linux">1.3 OK, now I know what Debian is... what is Linux?!</a></li>
-<li><a href="ch-basic_defs.en.html#s-non-linux">1.4 Does Debian just do GNU/Linux?</a></li>
-<li><a href="ch-basic_defs.en.html#s-difference">1.5 What is the difference between Debian GNU/Linux and other Linux distributions? Why should I choose Debian over some other distribution?</a></li>
-<li><a href="ch-basic_defs.en.html#s-gnu">1.6 How does the Debian project fit in or compare with the Free Software Foundation's GNU project?</a></li>
-<li><a href="ch-basic_defs.en.html#s-pronunciation">1.7 How does one pronounce Debian and what does this word mean?</a></li>
-</ul></li>
-<li><a href="ch-getting.en.html">2 Getting and installing Debian GNU/Linux</a></li>
-<li><ul>
-<li><a href="ch-getting.en.html#s-version">2.1 What is the latest version of Debian?</a></li>
-<li><a href="ch-getting.en.html#s-updatestable">2.2 Are there package upgrades in `stable'?</a></li>
-<li><a href="ch-getting.en.html#s-boot-floppies">2.3 Where/how can I get the Debian installation disks?</a></li>
-<li><a href="ch-getting.en.html#s-cdrom">2.4 How do I install the Debian from CD-ROMs?</a></li>
-<li><a href="ch-getting.en.html#s-cdimage-symlinks">2.5 Why does the official stable released CD-ROM contain symlinks for `frozen' and `unstable'? I thought this CD contains just `stable'!</a></li>
-<li><a href="ch-getting.en.html#s-cdimages">2.6 I have my own CD-writer, are there CD images available somewhere?</a></li>
-<li><a href="ch-getting.en.html#s-floppy">2.7 Can I install it from a pile of floppy disks?</a></li>
-<li><a href="ch-getting.en.html#s-remoteinstall">2.8 Can I get and install Debian directly from a remote Internet site?</a></li>
-</ul></li>
-<li><a href="ch-compat.en.html">3 Compatibility issues</a></li>
-<li><ul>
-<li><a href="ch-compat.en.html#s-arches">3.1 On what hardware architectures/systems does Debian GNU/Linux run?</a></li>
-<li><a href="ch-compat.en.html#s-otherdistribs">3.2 How compatible is Debian with other distributions of Linux?</a></li>
-<li><a href="ch-compat.en.html#s-otherunices">3.3 How source code compatible is Debian with other Unix systems?</a></li>
-<li><a href="ch-compat.en.html#s-otherpackages">3.4 Can I use Debian packages (&quot;.deb&quot; files) on my Red Hat/Slackware/... Linux system? Can I use Red Hat packages (&quot;.rpm&quot; files) on my Debian GNU/Linux system?</a></li>
-<li><a href="ch-compat.en.html#s-libc5">3.5 Is Debian able to run my old libc5 programs?</a></li>
-<li><a href="ch-compat.en.html#s-libc5-compile">3.6 Can Debian be used to compile libc5 programs?</a></li>
-<li><a href="ch-compat.en.html#s-non-debian-programs">3.7 How should I install a non-Debian program?</a></li>
-<li><a href="ch-compat.en.html#s-termcap">3.8 Why can't I compile programs that require libtermcap?</a></li>
-<li><a href="ch-compat.en.html#s-accelx">3.9 Why can't I install AccelX?</a></li>
-<li><a href="ch-compat.en.html#s-motifnls">3.10 Why do my old XFree 2.1 Motif applications crash?</a></li>
-</ul></li>
-<li><a href="ch-software.en.html">4 Software available in the Debian system</a></li>
-<li><ul>
-<li><a href="ch-software.en.html#s-apps">4.1 What types of applications and development software are available for Debian GNU/Linux?</a></li>
-<li><a href="ch-software.en.html#s-softwareauthors">4.2 Who wrote all that software?</a></li>
-<li><a href="ch-software.en.html#s-pkglist">4.3 How can I get a current list of programs that have been packaged for Debian?</a></li>
-<li><a href="ch-software.en.html#s-missing">4.4 What is missing from Debian GNU/Linux?</a></li>
-<li><a href="ch-software.en.html#s-no-devs">4.5 Why do I get &quot;ld: cannot find -lfoo&quot; messages when compiling programs? Why aren't there any libfoo.so files in Debian library packages?</a></li>
-<li><a href="ch-software.en.html#s-java">4.6 (How) Does Debian support Java?</a></li>
-<li><a href="ch-software.en.html#s-isitdebian">4.7 How can I check that I am using a Debian system, and what version is it?</a></li>
-<li><a href="ch-software.en.html#s-nonenglish">4.8 How does Debian support non-English languages?</a></li>
-<li><a href="ch-software.en.html#s-usexports">4.9 What about the US export regulation limitations?</a></li>
-<li><a href="ch-software.en.html#s-pine">4.10 Where is pine?</a></li>
-<li><a href="ch-software.en.html#s-qmail">4.11 Where is qmail/ezmlm/djbdns?</a></li>
-</ul></li>
-<li><a href="ch-ftparchives.en.html">5 The Debian FTP archives</a></li>
-<li><ul>
-<li><a href="ch-ftparchives.en.html#s-dirtree">5.1 What are all those directories at the Debian FTP archives?</a></li>
-<li><a href="ch-ftparchives.en.html#s-dists">5.2 How many Debian distributions are there in the <samp>dists</samp> directory?</a></li>
-<li><a href="ch-ftparchives.en.html#s-codenames">5.3 What are all those names like slink, potato, etc.?</a></li>
-<li><ul>
-<li><a href="ch-ftparchives.en.html#s-oldcodenames">5.3.1 Which other codenames have been used in the past?</a></li>
-<li><a href="ch-ftparchives.en.html#s-sourceforcodenames">5.3.2 Where do these codenames come from?</a></li>
-</ul></li>
-<li><a href="ch-ftparchives.en.html#s-sid">5.4 What about &quot;sid&quot;?</a></li>
-<li><a href="ch-ftparchives.en.html#s-stable">5.5 What does the stable directory contain?</a></li>
-<li><a href="ch-ftparchives.en.html#s-testing">5.6 What does the testing directory contain?</a></li>
-<li><ul>
-<li><a href="ch-ftparchives.en.html#s-frozen">5.6.1 What about &quot;testing&quot;? How is it `frozen'?</a></li>
-</ul></li>
-<li><a href="ch-ftparchives.en.html#s-unstable">5.7 What does the unstable directory contain?</a></li>
-<li><a href="ch-ftparchives.en.html#s-archsections">5.8 What are all those directories inside <samp>dists/stable/main</samp>?</a></li>
-<li><a href="ch-ftparchives.en.html#s-source">5.9 Where is the source code?</a></li>
-<li><a href="ch-ftparchives.en.html#s-pools">5.10 What's in the <samp>pool</samp> directory?</a></li>
-<li><a href="ch-ftparchives.en.html#s-incoming">5.11 What is &quot;incoming&quot;?</a></li>
-<li><a href="ch-ftparchives.en.html#s-ownrepository">5.12 How do I set up my own apt-able repository?</a></li>
-</ul></li>
-<li><a href="ch-pkg_basics.en.html">6 Basics of the Debian package management system</a></li>
-<li><ul>
-<li><a href="ch-pkg_basics.en.html#s-package">6.1 What is a Debian package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-deb-format">6.2 What is the format of a Debian binary package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-pkgname">6.3 Why are Debian package file names so long?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-controlfile">6.4 What is a Debian control file?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-conffile">6.5 What is a Debian conffile?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-maintscripts">6.6 What is a Debian preinst, postinst, prerm, and postrm script?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-priority">6.7 What is an <em>Essential</em> <em>Required</em>, <em>Important</em>, <em>Standard</em>, <em>Optional</em>, or <em>Extra</em> package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-virtual">6.8 What is a Virtual Package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-depends">6.9 What is meant by saying that a package <em>Depends</em>, <em>Recommends</em>, <em>Suggests</em>, <em>Conflicts</em>, <em>Replaces</em> or <em>Provides</em> another package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-pre-depends">6.10 What is meant by Pre-Depends?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-pkgstatus">6.11 What is meant by <em>unknown</em>, <em>install</em>, <em>remove</em> <em>purge</em> and <em>hold</em> in the package status?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-puttingonhold">6.12 How do I put a package on hold?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-sourcepkgs">6.13 How do I install a source package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-sourcebuild">6.14 How do I build binary packages from a source package?</a></li>
-<li><a href="ch-pkg_basics.en.html#s-creatingdebs">6.15 How do I create Debian packages myself?</a></li>
-</ul></li>
-<li><a href="ch-pkgtools.en.html">7 The Debian package management tools</a></li>
-<li><ul>
-<li><a href="ch-pkgtools.en.html#s-pkgprogs">7.1 What programs does Debian provide for managing its packages?</a></li>
-<li><ul>
-<li><a href="ch-pkgtools.en.html#s-dpkg">7.1.1 dpkg</a></li>
-<li><a href="ch-pkgtools.en.html#s-apt-get">7.1.2 APT</a></li>
-<li><a href="ch-pkgtools.en.html#s-aptitude">7.1.3 aptitude</a></li>
-<li><a href="ch-pkgtools.en.html#s-dselect">7.1.4 dselect</a></li>
-<li><a href="ch-pkgtools.en.html#s-dpkg-extra">7.1.5 Other package management tools</a></li>
-</ul></li>
-<li><a href="ch-pkgtools.en.html#s-updaterunning">7.2 Debian claims to be able to update a running program; how is this accomplished?</a></li>
-<li><a href="ch-pkgtools.en.html#s-whatpackages">7.3 How can I tell what packages are already installed on a Debian system?</a></li>
-<li><a href="ch-pkgtools.en.html#s-filesearch">7.4 How can I find out what package produced a particular file?</a></li>
-<li><a href="ch-pkgtools.en.html#s-datapackages">7.5 Why doesn't get `foo-data' removed when I uninstall `foo'? How do I make sure old unused library-packages get purged?</a></li>
-</ul></li>
-<li><a href="ch-uptodate.en.html">8 Keeping your Debian system up-to-date</a></li>
-<li><ul>
-<li><a href="ch-uptodate.en.html#s-libc5to6upgrade">8.1 How can I upgrade my Debian 1.3.1 (or earlier) distribution, based on libc5, to 2.0 (or later), based on libc6?</a></li>
-<li><a href="ch-uptodate.en.html#s-howtocurrent">8.2 How can I keep my Debian system current?</a></li>
-<li><ul>
-<li><a href="ch-uptodate.en.html#s-aptitude-upgrade">8.2.1 aptitude</a></li>
-<li><a href="ch-uptodate.en.html#s-apt">8.2.2 apt-get, dselect and apt-cdrom</a></li>
-<li><a href="ch-uptodate.en.html#s-dpkg-ftp">8.2.3 dpkg-ftp</a></li>
-<li><a href="ch-uptodate.en.html#s-mirror">8.2.4 mirror</a></li>
-<li><a href="ch-uptodate.en.html#s-dpkg-mountable">8.2.5 dpkg-mountable</a></li>
-</ul></li>
-<li><a href="ch-uptodate.en.html#s-upgradesingle">8.3 Must I go into single user mode in order to upgrade a package?</a></li>
-<li><a href="ch-uptodate.en.html#s-savedebs">8.4 Do I have to keep all those .deb archive files on my disk?</a></li>
-<li><a href="ch-uptodate.en.html#s-keepingalog">8.5 How can I keep a log of the packages I added to the system? I'd like to know when which package upgrades and removals have occured!</a></li>
-</ul></li>
-<li><a href="ch-kernel.en.html">9 Debian and the kernel</a></li>
-<li><ul>
-<li><a href="ch-kernel.en.html#s-non-debian-kernel">9.1 Can I install and compile a kernel without some Debian-specific tweaking?</a></li>
-<li><a href="ch-kernel.en.html#s-customkernel">9.2 What tools does Debian provide to build custom kernels?</a></li>
-<li><a href="ch-kernel.en.html#s-custombootdisk">9.3 How can I make a custom boot floppy?</a></li>
-<li><a href="ch-kernel.en.html#s-modules">9.4 What special provisions does Debian provide to deal with modules?</a></li>
-<li><a href="ch-kernel.en.html#s-removeoldkernel">9.5 Can I safely de-install an old kernel package, and if so, how?</a></li>
-</ul></li>
-<li><a href="ch-customizing.en.html">10 Customizing your installation of Debian GNU/Linux</a></li>
-<li><ul>
-<li><a href="ch-customizing.en.html#s-papersize">10.1 How can I ensure that all programs use the same paper size?</a></li>
-<li><a href="ch-customizing.en.html#s-hardwareaccess">10.2 How can I provide access to hardware peripherals, without compromising security?</a></li>
-<li><a href="ch-customizing.en.html#s-consolefont">10.3 How do I load a console font on startup the Debian way?</a></li>
-<li><a href="ch-customizing.en.html#s-appdefaults">10.4 How can I configure an X11 program's application defaults?</a></li>
-<li><a href="ch-customizing.en.html#s-booting">10.5 Every distribution seems to have a different boot-up method. Tell me about Debian's.</a></li>
-<li><a href="ch-customizing.en.html#s-custombootscripts">10.6 It looks as if Debian does not use <samp>rc.local</samp> to customize the boot process; what facilities are provided?</a></li>
-<li><a href="ch-customizing.en.html#s-interconffiles">10.7 How does the package management system deal with packages that contain configuration files for other packages?</a></li>
-<li><a href="ch-customizing.en.html#s-divert">10.8 How do I override a file installed by a package, so that a different version can be used instead?</a></li>
-<li><a href="ch-customizing.en.html#s-localpackages">10.9 How can I have my locally-built package included in the list of available packages that the package management system knows about?</a></li>
-<li><a href="ch-customizing.en.html#s-diverse">10.10 Some users like mawk, others like gawk; some like vim, others like elvis; some like trn, others like tin; how does Debian support diversity?</a></li>
-</ul></li>
-<li><a href="ch-support.en.html">11 Getting support for Debian GNU/Linux</a></li>
-<li><ul>
-<li><a href="ch-support.en.html#s-debiandocs">11.1 What other documentation exists on and for a Debian system?</a></li>
-<li><a href="ch-support.en.html#s-onlineresources">11.2 Are there any on-line resources for discussing Debian?</a></li>
-<li><ul>
-<li><a href="ch-support.en.html#s11.2.1">11.2.1 Mailing lists</a></li>
-<li><a href="ch-support.en.html#s11.2.2">11.2.2 Maintainers</a></li>
-<li><a href="ch-support.en.html#s11.2.3">11.2.3 Usenet newsgroups</a></li>
-</ul></li>
-<li><a href="ch-support.en.html#s-searchtools">11.3 Is there a quick way to search for information on Debian GNU/Linux?</a></li>
-<li><a href="ch-support.en.html#s-buglogs">11.4 Are there logs of known bugs?</a></li>
-<li><a href="ch-support.en.html#s-bugreport">11.5 How do I report a bug in Debian?</a></li>
-</ul></li>
-<li><a href="ch-contributing.en.html">12 Contributing to the Debian Project</a></li>
-<li><ul>
-<li><a href="ch-contributing.en.html#s-contrib">12.1 How can I become a Debian software developer?</a></li>
-<li><a href="ch-contributing.en.html#s-contribresources">12.2 How can I contribute resources to the Debian project?</a></li>
-<li><a href="ch-contributing.en.html#s-supportingorganizations">12.3 How can I contribute financially to the Debian project?</a></li>
-<li><ul>
-<li><a href="ch-contributing.en.html#s-SPI">12.3.1 Software in the Public Interest</a></li>
-<li><a href="ch-contributing.en.html#s-FSF">12.3.2 Free Software Foundation</a></li>
-</ul></li>
-</ul></li>
-<li><a href="ch-redistrib.en.html">13 Redistributing Debian GNU/Linux in a commercial product</a></li>
-<li><ul>
-<li><a href="ch-redistrib.en.html#s-sellcds">13.1 Can I make and sell Debian CDs?</a></li>
-<li><a href="ch-redistrib.en.html#s-packagednonfree">13.2 Can Debian be packaged with non-free software?</a></li>
-<li><a href="ch-redistrib.en.html#s-childistro">13.3 I am making a special Linux distribution for a &quot;vertical market&quot;. Can I use Debian GNU/Linux for the guts of a Linux system and add my own applications on top of it?</a></li>
-<li><a href="ch-redistrib.en.html#s-commercialdebs">13.4 Can I put my commercial program in a Debian &quot;package&quot; so that it installs effortlessly on any Debian system?</a></li>
-</ul></li>
-<li><a href="ch-nexttime.en.html">14 Changes expected in the next major release of Debian</a></li>
-<li><ul>
-<li><a href="ch-nexttime.en.html#s-security">14.1 Increased security</a></li>
-<li><a href="ch-nexttime.en.html#s-i18n">14.2 Extended support for non-English users</a></li>
-<li><a href="ch-nexttime.en.html#s-morearches">14.3 More architectures</a></li>
-<li><a href="ch-nexttime.en.html#s-morekernels">14.4 More kernels</a></li>
-</ul></li>
-<li><a href="ch-faqinfo.en.html">15 General information about the FAQ</a></li>
-<li><ul>
-<li><a href="ch-faqinfo.en.html#s-authors">15.1 Authors</a></li>
-<li><a href="ch-faqinfo.en.html#s-feedback">15.2 Feedback</a></li>
-<li><a href="ch-faqinfo.en.html#s-latest">15.3 Availability</a></li>
-<li><a href="ch-faqinfo.en.html#s-docformat">15.4 Document format</a></li>
-</ul></li>
-</ul>
-
-<hr>
-
-<p>
-[ <a href="ch-faqinfo.en.html">previous</a> ]
-[ <a href="#contents">Contents</a> ]
-[ <a href="ch-basic_defs.en.html">1</a> ]
-[ <a href="ch-getting.en.html">2</a> ]
-[ <a href="ch-compat.en.html">3</a> ]
-[ <a href="ch-software.en.html">4</a> ]
-[ <a href="ch-ftparchives.en.html">5</a> ]
-[ <a href="ch-pkg_basics.en.html">6</a> ]
-[ <a href="ch-pkgtools.en.html">7</a> ]
-[ <a href="ch-uptodate.en.html">8</a> ]
-[ <a href="ch-kernel.en.html">9</a> ]
-[ <a href="ch-customizing.en.html">10</a> ]
-[ <a href="ch-support.en.html">11</a> ]
-[ <a href="ch-contributing.en.html">12</a> ]
-[ <a href="ch-redistrib.en.html">13</a> ]
-[ <a href="ch-nexttime.en.html">14</a> ]
-[ <a href="ch-faqinfo.en.html">15</a> ]
-[ <a href="ch-basic_defs.en.html">next</a> ]
-</p>
-
-<hr>
-
-<p>
-The Debian GNU/Linux FAQ
-</p>
-
-<address>
-version 3.1.3, 25 April 2006<br>
-<br>
-Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
-<br>
-</address>
-<hr>
-
-</body>
-
-</html>
-
diff --git a/includes/common/doc/social-contract.txt b/includes/common/doc/social-contract.txt
deleted file mode 100644
index cd9c368..0000000
--- a/includes/common/doc/social-contract.txt
+++ /dev/null
@@ -1,131 +0,0 @@
-Debian GNU/Linux Social Contract
-
-The Debian Project is an association of individuals who have made common
-cause to create a free operating system.  This is the "social contract"
-we offer to the free software community.
-
-  ------------------------------------------------------------------------
-
-"Social Contract" with the Free Software Community
-
-  1. Debian Will Remain 100% Free Software
-
-     We promise to keep the Debian GNU/Linux Distribution entirely free
-     software. As there are many definitions of free software, we include
-     the guidelines we use to determine if software is "free" below. We will
-     support our users who develop and run non-free software on Debian, but
-     we will never make the system depend on an item of non-free software.
-
-  2. We Will Give Back to the Free Software Community
-
-     When we write new components of the Debian system, we will license them
-     as free software. We will make the best system we can, so that free
-     software will be widely distributed and used. We will feed back
-     bug-fixes, improvements, user requests, etc. to the "upstream" authors
-     of software included in our system.
-
-  3. We Won't Hide Problems
-
-     We will keep our entire bug-report database open for public view at all
-     times. Reports that users file on-line will immediately become visible
-     to others.
-
-  4. Our Priorities are Our Users and Free Software
-
-     We will be guided by the needs of our users and the free-software
-     community. We will place their interests first in our priorities. We
-     will support the needs of our users for operation in many different
-     kinds of computing environment. We won't object to commercial software
-     that is intended to run on Debian systems, and we'll allow others to
-     create value-added distributions containing both Debian and commercial
-     software, without any fee from us. To support these goals, we will
-     provide an integrated system of high-quality, 100% free software, with
-     no legal restrictions that would prevent these kinds of use.
-
-  5. Programs That Don't Meet Our Free-Software Standards
-
-     We acknowledge that some of our users require the use of programs that
-     don't conform to the Debian Free Software Guidelines. We have created
-     "contrib" and "non-free" areas in our FTP archive for this software.
-     The software in these directories is not part of the Debian system,
-     although it has been configured for use with Debian. We encourage CD
-     manufacturers to read the licenses of software packages in these
-     directories and determine if they can distribute that software on their
-     CDs. Thus, although non-free software isn't a part of Debian, we
-     support its use, and we provide infrastructure (such as our
-     bug-tracking system and mailing lists) for non-free software packages.
-
-  ------------------------------------------------------------------------
-
-The Debian Free Software Guidelines
-
-  1. Free Redistribution
-
-     The license of a Debian component may not restrict any party from
-     selling or giving away the software as a component of an aggregate
-     software distribution containing programs from several different
-     sources. The license may not require a royalty or other fee for such
-     sale.
-
-  2. Source Code
-
-     The program must include source code, and must allow distribution in
-     source code as well as compiled form.
-
-  3. Derived Works
-
-     The license must allow modifications and derived works, and must allow
-     them to be distributed under the same terms as the license of the
-     original software.
-
-  4. Integrity of The Author's Source Code
-
-     The license may restrict source-code from being distributed in modified
-     form _only if the license allows the distribution of "patch files" with
-     the source code for the purpose of modifying the program at build time.
-     The license must explicitly permit distribution of software built from
-     modified source code. The license may require derived works to carry a
-     different name or version number from the original software. (This is a
-     compromise. The Debian group encourages all authors to not restrict any
-     files, source or binary, from being modified.)
-
-  5. No Discrimination Against Persons or Groups
-
-     The license must not discriminate against any person or group of
-     persons.
-
-  6. No Discrimination Against Fields of Endeavor
-
-     The license must not restrict anyone from making use of the program in
-     a specific field of endeavor. For example, it may not restrict the
-     program from being used in a business, or from being used for genetic
-     research.
-
-  7. Distribution of License
-
-     The rights attached to the program must apply to all to whom the
-     program is redistributed without the need for execution of an
-     additional license by those parties.
-
-  8. License Must Not Be Specific to Debian
-
-     The rights attached to the program must not depend on the program's
-     being part of a Debian system. If the program is extracted from Debian
-     and used or distributed without Debian but otherwise within the terms
-     of the program's license, all parties to whom the program is
-     redistributed should have the same rights as those that are granted in
-     conjunction with the Debian system.
-
-  9. License Must Not Contaminate Other Software
-
-     The license must not place restrictions on other software that is
-     distributed along with the licensed software. For example, the license
-     must not insist that all other programs distributed on the same medium
-     must be free software.
-
- 10. Example Licenses
-
-     The "GPL", "BSD", and "Artistic" licenses are examples of licenses that
-     we consider "free".
-
-  ------------------------------------------------------------------------
diff --git a/includes/common/install/README.sbm b/includes/etch/install.386/install/README.sbm
index 4087670..4087670 100644
--- a/includes/common/install/README.sbm
+++ b/includes/etch/install.386/install/README.sbm
diff --git a/includes/common/install/sbm.bin b/includes/etch/install.386/install/sbm.bin
index b6e2415..b6e2415 100644
--- a/includes/common/install/sbm.bin
+++ b/includes/etch/install.386/install/sbm.bin
diff --git a/includes/etch/install.amd/install b/includes/etch/install.amd/install
new file mode 120000
index 0000000..7ba56c8
--- /dev/null
+++ b/includes/etch/install.amd/install
@@ -0,0 +1 @@
+../install.386/install
\ No newline at end of file
diff --git a/includes/common/README.html b/includes/etch/install/README.html
index 2214064..549a748 100644
--- a/includes/common/README.html
+++ b/includes/etch/install/README.html
@@ -77,7 +77,7 @@
  <table align="center" border="0" cellpadding="2" cellspacing="0">
  <tr><td bgcolor="#000084">
  <div align="center"><font color="#FFFFFF" face="helvetica,arial"><B>&nbsp;&nbsp;
- Debian GNU/Linux testing "Etch" - Official Beta i386 NETINST Binary-1 20070317-20:46
+ DEBIAN_NAME DEBIAN_DATE
  &nbsp;&nbsp;</B></font></div>
  </td></tr>
  </table>
@@ -262,7 +262,6 @@ Debian is available for various kinds of computers
 (&quot;architectures&quot;), like
 &quot;IBM-compatible&quot; PCs (<i>i386</i>),
 Compaq's <i>Alpha</i>,
-Motorola's 680x0 (<i>m68k</i>),
 Sun's <i>Sparc</i>,
 Motorola/IBM's <i>PowerPC</i>, and <i>(Strong)ARM</i> processors.
 Check the <A href="http://www.debian.org/ports">ports</A> page
@@ -297,13 +296,18 @@ About This Disc
 This disc is labeled
 <P>
 <tt>&nbsp;
-  Debian GNU/Linux testing "Etch" - Official Beta i386 NETINST Binary-1 20070317-20:46
+  DEBIAN_NAME DEBIAN_DATE
 </tt>
 <P>
 
 which means that this disc is number 1 of a set of 1 discs.
 
-It contains programs ("binaries") for `i386' computers.
+It contains programs ("binaries") for `DEBIAN_ARCHITECTURE' computers.
+
+
+
+
+
 <P>
 The programs on the Binary discs are ordered by popularity. The Binary-1 disc
 contains the most popular programs and the installation tools; it is possible
@@ -349,14 +353,8 @@ Installing
  <P>
  Programs and other files that are needed for the installation can be found on
  this disc under
- <P>
- <tt>&nbsp;
- <A href="tools/">/tools/</a>
- </tt>
- and
- <tt>&nbsp;
- <A href="install/floppy/">/install/floppy/</a>
- </tt>
+ DEBIAN_TOOLS
+
 
 
   <P>
@@ -370,12 +368,7 @@ Installing
 
 
 
-
-   You can also
-
-
-
-  examine the
+   You can examine the
   <P>
   <tt>&nbsp;
   <a href="install/">/install</a>
@@ -407,23 +400,21 @@ Last-Minute Notes
 </a>
 <p>
 <UL>
-<LI>
-
-
-
-
 
 
 
 
-You should keep in mind that this is a beta disc of the current
-development version of the Debian system. This means that all sorts of
-bugs may be present anywhere in the system.
 
 
 
 
 
+<LI>This is an official release of the Debian system. Please report any
+bugs you find in the Debian Bug Tracking System; details at <A
+HREF="http://bugs.debian.org/">bugs.debian.org</A>.
+<LI>If you're reporting bugs against this disc or the installation
+system, please also mention the version of this disc; this can be
+found in the file <a href="/.disk/info">/.disk/info</a>.
 
 
 <br>&nbsp;
diff --git a/includes/common/README.mirrors.html b/includes/etch/install/README.mirrors.html
index fd46ab4..24a9cdc 100644
--- a/includes/common/README.mirrors.html
+++ b/includes/etch/install/README.mirrors.html
@@ -70,7 +70,7 @@ Everything else you want to know about Debian mirrors:
   <td width="25%">Australia</td>
   <td width="25%" align="center"><code>ftp.au.debian.org</code></td>
   <td width="25%"><a href="http://ftp.au.debian.org/debian/">/debian/</a></td>
-  <td width="25%">alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc</td>
+  <td width="25%">alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</td>
 </tr>
 <tr>
   <td width="25%">Australia</td>
@@ -100,7 +100,7 @@ Everything else you want to know about Debian mirrors:
   <td width="25%">Chile</td>
   <td width="25%" align="center"><code>ftp.cl.debian.org</code></td>
   <td width="25%"><a href="http://ftp.cl.debian.org/debian/">/debian/</a></td>
-  <td width="25%">amd64 i386 powerpc</td>
+  <td width="25%">alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc</td>
 </tr>
 <tr>
   <td width="25%">Czech&nbsp;Republic</td>
@@ -319,7 +319,7 @@ debian.inode.at                   <a href="ftp://debian.inode.at/debian/">/debia
 <b>AU Australia</b>
 ------------
 ftp.wa.au.debian.org              <a href="ftp://ftp.wa.au.debian.org/debian/">/debian/</a>                               <a href="http://ftp.wa.au.debian.org/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.au.debian.org                 <a href="ftp://ftp.au.debian.org/debian/">/debian/</a>                               <a href="http://ftp.au.debian.org/debian/">/debian/</a>                           alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.au.debian.org                 <a href="ftp://ftp.au.debian.org/debian/">/debian/</a>                               <a href="http://ftp.au.debian.org/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 mirror.aarnet.edu.au              <a href="ftp://mirror.aarnet.edu.au/debian/">/debian/</a>                               <a href="http://mirror.aarnet.edu.au/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.monash.edu.au                 <a href="ftp://ftp.monash.edu.au/pub/linux/debian/">/pub/linux/debian/</a>                     <a href="http://ftp.monash.edu.au/pub/linux/debian/">/pub/linux/debian/</a>                 amd64 i386
 ftp.uwa.edu.au                    <a href="ftp://ftp.uwa.edu.au/debian/">/debian/</a>                               <a href="http://ftp.uwa.edu.au/debian/">/debian/</a>                           amd64 i386
@@ -327,7 +327,7 @@ mirror.eftel.com                  <a href="ftp://mirror.eftel.com/debian/">/debi
 mirror.pacific.net.au             <a href="ftp://mirror.pacific.net.au/debian/">/debian/</a>                               <a href="http://mirror.pacific.net.au/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.iinet.net.au                  <a href="ftp://ftp.iinet.net.au/debian/debian/">/debian/debian/</a>                        <a href="http://ftp.iinet.net.au/debian/debian/">/debian/debian/</a>                    alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 mirror.datafast.net.au            <a href="ftp://mirror.datafast.net.au/debian/">/debian/</a>                               <a href="http://mirror.datafast.net.au/debian/">/debian/</a>                           amd64 i386
-mirror.optus.net                                                         <a href="http://mirror.optus.net/debian/">/debian/</a>                           amd64 i386
+mirror.optus.net                  <a href="ftp://mirror.optus.net/debian/">/debian/</a>                               <a href="http://mirror.optus.net/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 <b>BE Belgium</b>
 ----------
@@ -356,7 +356,7 @@ debian.pop-sc.rnp.br                                                     <a href
 
 <b>BY Belarus</b>
 ----------
-linux.org.by                                                             <a href="http://linux.org.by/debian/">/debian/</a>                           amd64 i386
+linux.org.by                      <a href="ftp://linux.org.by/debian/">/debian/</a>                               <a href="http://linux.org.by/debian/">/debian/</a>                           amd64 i386
 ftp.mgts.by                       <a href="ftp://ftp.mgts.by/debian/">/debian/</a>                               <a href="http://ftp.mgts.by/debian/">/debian/</a>                           amd64 i386
 
 <b>CA Canada</b>
@@ -377,7 +377,7 @@ mirror.switch.ch                  <a href="ftp://mirror.switch.ch/mirror/debian/
 
 <b>CL Chile</b>
 --------
-ftp.cl.debian.org                 <a href="ftp://ftp.cl.debian.org/debian/">/debian/</a>                               <a href="http://ftp.cl.debian.org/debian/">/debian/</a>                           amd64 i386 powerpc
+ftp.cl.debian.org                 <a href="ftp://ftp.cl.debian.org/debian/">/debian/</a>                               <a href="http://ftp.cl.debian.org/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 debian.ubiobio.cl                                                        <a href="http://debian.ubiobio.cl/debian/">/debian/</a>                           amd64 i386 powerpc sparc
 
 <b>CN China</b>
@@ -400,7 +400,6 @@ ftp2.de.debian.org                <a href="ftp://ftp2.de.debian.org/debian/">/de
 ftp.tu-clausthal.de               <a href="ftp://ftp.tu-clausthal.de/pub/linux/debian/">/pub/linux/debian/</a>                                                        amd64 arm i386 ia64 m68k mips powerpc sparc
 debian.uni-essen.de               <a href="ftp://debian.uni-essen.de/debian/">/debian/</a>                               <a href="http://debian.uni-essen.de/debian/">/debian/</a>                           amd64 hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
 ftp.freenet.de                    <a href="ftp://ftp.freenet.de/pub/ftp.debian.org/debian/">/pub/ftp.debian.org/debian/</a>            <a href="http://ftp.freenet.de/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.uni-erlangen.de               <a href="ftp://ftp.uni-erlangen.de/pub/Linux/debian/">/pub/Linux/debian/</a>                     <a href="http://ftp.uni-erlangen.de/pub/Linux/debian/">/pub/Linux/debian/</a>                 alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 sunsite.informatik.rwth-aachen.de <a href="ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/debian/">/pub/Linux/debian/</a>                     <a href="http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/debian/">/ftp/pub/Linux/debian/</a>             alpha amd64 i386 powerpc sparc
 ftp-stud.fht-esslingen.de         <a href="ftp://ftp-stud.fht-esslingen.de/debian/">/debian/</a>                               <a href="http://ftp-stud.fht-esslingen.de/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.stw-bonn.de                   <a href="ftp://ftp.stw-bonn.de/debian/">/debian/</a>                               <a href="http://ftp.stw-bonn.de/debian/">/debian/</a>                           amd64 i386
@@ -422,6 +421,7 @@ debian.intergenia.de                                                     <a href
 debian.swordcoast.net             <a href="ftp://debian.swordcoast.net/debian/">/debian/</a>                               <a href="http://debian.swordcoast.net/debian/">/debian/</a>                           alpha amd64 arm hurd-i386 i386 ia64 m68k powerpc
 debian.cruisix.net                <a href="ftp://debian.cruisix.net/debian/">/debian/</a>                               <a href="http://debian.cruisix.net/debian/">/debian/</a>                           amd64 i386 powerpc
 ftp.rrzn.uni-hannover.de          <a href="ftp://ftp.rrzn.uni-hannover.de/debian/debian/">/debian/debian/</a>                                                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian-ftp.charite.de                                                    <a href="http://debian-ftp.charite.de/debian/">/debian/</a>                           i386
 
 <b>DK Denmark</b>
 ----------
@@ -444,6 +444,7 @@ ftp.caliu.info                    <a href="ftp://ftp.caliu.info/debian/">/debian
 ftp.gva.es                        <a href="ftp://ftp.gva.es/pub/mirror/debian/">/pub/mirror/debian/</a>                    <a href="http://ftp.gva.es/mirror/debian/">/mirror/debian/</a>                    alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.gul.uc3m.es                   <a href="ftp://ftp.gul.uc3m.es/debian/">/debian/</a>                               <a href="http://ftp.gul.uc3m.es/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.um.es                         <a href="ftp://ftp.um.es/mirror/debian/">/mirror/debian/</a>                                                           all
+jane.uab.cat                      <a href="ftp://jane.uab.cat/debian/">/debian/</a>                               <a href="http://jane.uab.cat/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 <b>FI Finland</b>
 ----------
@@ -523,7 +524,6 @@ ftp.esat.net                      <a href="ftp://ftp.esat.net/pub/linux/debian/"
 <b>IL Israel</b>
 ---------
 mirror.hamakor.org.il                                                    <a href="http://mirror.hamakor.org.il/pub/mirrors/debian/">/pub/mirrors/debian/</a>               amd64 i386
-mirror.inter.net.il               <a href="ftp://mirror.inter.net.il/pub/debian/">/pub/debian/</a>                           <a href="http://mirror.inter.net.il/pub/debian/">/pub/debian/</a>                       amd64 i386 sparc
 debian.co.il                                                             <a href="http://debian.co.il/debian/">/debian/</a>                           amd64 i386
 
 <b>IS Iceland</b>
@@ -534,7 +534,7 @@ ftp.is.debian.org                 <a href="ftp://ftp.is.debian.org/debian/">/deb
 --------
 ftp.it.debian.org                 <a href="ftp://ftp.it.debian.org/debian/">/debian/</a>                               <a href="http://ftp.it.debian.org/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.bononia.it                    <a href="ftp://ftp.bononia.it/debian/">/debian/</a>                               <a href="http://ftp.bononia.it/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-freedom.dicea.unifi.it                                                   <a href="http://freedom.dicea.unifi.it/ftp/pub/linux/debian/">/ftp/pub/linux/debian/</a>             amd64 hurd-i386 i386
+freedom.dicea.unifi.it            <a href="ftp://freedom.dicea.unifi.it/pub/linux/debian/">/pub/linux/debian/</a>                     <a href="http://freedom.dicea.unifi.it/ftp/pub/linux/debian/">/ftp/pub/linux/debian/</a>             amd64 hurd-i386 i386
 ftp.eutelia.it                    <a href="ftp://ftp.eutelia.it/pub/Debian_Mirror/">/pub/Debian_Mirror/</a>                                                       alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 mi.mirror.garr.it                 <a href="ftp://mi.mirror.garr.it/mirrors/debian/">/mirrors/debian/</a>                       <a href="http://mi.mirror.garr.it/mirrors/debian/">/mirrors/debian/</a>                   alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 debian.fastweb.it                 <a href="ftp://debian.fastweb.it/debian/">/debian/</a>                               <a href="http://debian.fastweb.it/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
@@ -550,8 +550,8 @@ ftp.dti.ad.jp                     <a href="ftp://ftp.dti.ad.jp/pub/Linux/debian/
 dennou-k.gfd-dennou.org           <a href="ftp://dennou-k.gfd-dennou.org/library/Linux/debian/">/library/Linux/debian/</a>                 <a href="http://dennou-k.gfd-dennou.org/library/Linux/debian/">/library/Linux/debian/</a>             alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 dennou-q.gfd-dennou.org           <a href="ftp://dennou-q.gfd-dennou.org/library/Linux/debian/">/library/Linux/debian/</a>                 <a href="http://dennou-q.gfd-dennou.org/library/Linux/debian/">/library/Linux/debian/</a>             alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.yz.yamagata-u.ac.jp           <a href="ftp://ftp.yz.yamagata-u.ac.jp/debian/">/debian/</a>                               <a href="http://ftp.yz.yamagata-u.ac.jp/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-sb.itc.u-tokyo.ac.jp              <a href="ftp://sb.itc.u-tokyo.ac.jp/DEBIAN/debian/">/DEBIAN/debian/</a>                                                           amd64 hurd-i386 i386 powerpc
-ftp.riken.go.jp                   <a href="ftp://ftp.riken.go.jp/pub/Linux/debian/debian/">/pub/Linux/debian/debian/</a>              <a href="http://ftp.riken.go.jp/pub/Linux/debian/debian/">/pub/Linux/debian/debian/</a>          amd64 i386
+sb.itc.u-tokyo.ac.jp              <a href="ftp://sb.itc.u-tokyo.ac.jp/DEBIAN/">/DEBIAN/</a>                               <a href="http://sb.itc.u-tokyo.ac.jp/DEBIAN/">/DEBIAN/</a>                           amd64 hurd-i386 i386 powerpc
+ftp.riken.jp                      <a href="ftp://ftp.riken.jp/pub/Linux/debian/debian/">/pub/Linux/debian/debian/</a>              <a href="http://ftp.riken.jp/pub/Linux/debian/debian/">/pub/Linux/debian/debian/</a>          amd64 i386
 debian.shimpinomori.net                                                  <a href="http://debian.shimpinomori.net/debian/">/debian/</a>                           amd64 i386 powerpc
 www.ring.gr.jp                    <a href="ftp://www.ring.gr.jp/pub/linux/debian/debian/">/pub/linux/debian/debian/</a>              <a href="http://www.ring.gr.jp/archives/linux/debian/debian/">/archives/linux/debian/debian/</a>     alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.jaist.ac.jp                   <a href="ftp://ftp.jaist.ac.jp/pub/Linux/Debian/">/pub/Linux/Debian/</a>                     <a href="http://ftp.jaist.ac.jp/pub/Linux/Debian/">/pub/Linux/Debian/</a>                 alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
@@ -628,6 +628,7 @@ ftp.se.debian.org                 <a href="ftp://ftp.se.debian.org/debian/">/deb
 ftp.sunet.se                      <a href="ftp://ftp.sunet.se/pub/os/Linux/distributions/debian/">/pub/os/Linux/distributions/debian/</a>    <a href="http://ftp.sunet.se/pub/os/Linux/distributions/debian/">/pub/os/Linux/distributions/debian/</a>alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.port80.se                     <a href="ftp://ftp.port80.se/debian/">/debian/</a>                               <a href="http://ftp.port80.se/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.ds.hj.se                      <a href="ftp://ftp.ds.hj.se/pub/os/linux/debian/">/pub/os/linux/debian/</a>                  <a href="http://ftp.ds.hj.se/pub/os/linux/debian/">/pub/os/linux/debian/</a>              alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.bsnet.se                   <a href="ftp://debian.bsnet.se/debian/">/debian/</a>                                                                  i386
 
 <b>SG Singapore</b>
 ------------
@@ -646,11 +647,11 @@ ftp.sk.debian.org                 <a href="ftp://ftp.sk.debian.org/debian/">/deb
 <b>TH Thailand</b>
 -----------
 ftp.coe.psu.ac.th                 <a href="ftp://ftp.coe.psu.ac.th/debian/">/debian/</a>                               <a href="http://ftp.coe.psu.ac.th/debian/">/debian/</a>                           i386
+ftp.thaios.net                                                           <a href="http://ftp.thaios.net/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 <b>TR Turkey</b>
 ---------
 ftp.tr.debian.org                 <a href="ftp://ftp.tr.debian.org/debian/">/debian/</a>                               <a href="http://ftp.tr.debian.org/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.linux.org.tr                  <a href="ftp://ftp.linux.org.tr/pub/mirrors/debian/">/pub/mirrors/debian/</a>                                                      amd64 i386
 godel.cs.bilgi.edu.tr                                                    <a href="http://godel.cs.bilgi.edu.tr/debian/">/debian/</a>                           hurd-i386 i386
 
 <b>TW Taiwan</b>
@@ -659,8 +660,9 @@ ftp.tw.debian.org                 <a href="ftp://ftp.tw.debian.org/debian/">/deb
 debian.csie.ntu.edu.tw            <a href="ftp://debian.csie.ntu.edu.tw/pub/debian/">/pub/debian/</a>                           <a href="http://debian.csie.ntu.edu.tw/debian/">/debian/</a>                           amd64 hurd-i386 i386
 linux.cdpa.nsysu.edu.tw                                                  <a href="http://linux.cdpa.nsysu.edu.tw/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 opensource.nchc.org.tw            <a href="ftp://opensource.nchc.org.tw/debian/">/debian/</a>                               <a href="http://opensource.nchc.org.tw/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.nctu.edu.tw                                                       <a href="http://debian.nctu.edu.tw/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.nctu.edu.tw                <a href="ftp://debian.nctu.edu.tw/debian/">/debian/</a>                               <a href="http://debian.nctu.edu.tw/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 mirror.nttu.edu.tw                <a href="ftp://mirror.nttu.edu.tw/debian/">/debian/</a>                               <a href="http://mirror.nttu.edu.tw/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.csie.nctu.edu.tw           <a href="ftp://debian.csie.nctu.edu.tw/debian/">/debian/</a>                               <a href="http://debian.csie.nctu.edu.tw/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 <b>UA Ukraine</b>
 ----------
@@ -678,7 +680,7 @@ distro.ibiblio.org                <a href="ftp://distro.ibiblio.org/pub/linux/di
 ftp-mirror.internap.com           <a href="ftp://ftp-mirror.internap.com/pub/debian/">/pub/debian/</a>                           <a href="http://ftp-mirror.internap.com/pub/debian/">/pub/debian/</a>                       alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.cerias.purdue.edu             <a href="ftp://ftp.cerias.purdue.edu/pub/os/debian/">/pub/os/debian/</a>                        <a href="http://ftp.cerias.purdue.edu/pub/os/debian/">/pub/os/debian/</a>                    amd64 i386
 ftp.cs.unm.edu                    <a href="ftp://ftp.cs.unm.edu/mirrors/debian/">/mirrors/debian/</a>                                                          alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirror.cs.wisc.edu                <a href="ftp://mirror.cs.wisc.edu/pub/mirrors/linux/debian/">/pub/mirrors/linux/debian/</a>                                                amd64 i386
+mirror.cs.wisc.edu                <a href="ftp://mirror.cs.wisc.edu/pub/mirrors/linux/debian/">/pub/mirrors/linux/debian/</a>             <a href="http://mirror.cs.wisc.edu/pub/mirrors/linux/debian/">/pub/mirrors/linux/debian/</a>         amd64 i386
 ftp.uwsg.indiana.edu              <a href="ftp://ftp.uwsg.indiana.edu/linux/debian/">/linux/debian/</a>                         <a href="http://ftp.uwsg.indiana.edu/linux/debian/">/linux/debian/</a>                     alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 natasha.stmarytx.edu              <a href="ftp://natasha.stmarytx.edu/debian/">/debian/</a>                               <a href="http://natasha.stmarytx.edu/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.ndlug.nd.edu                  <a href="ftp://ftp.ndlug.nd.edu/debian/">/debian/</a>                               <a href="http://ftp.ndlug.nd.edu/mirrors/debian/">/mirrors/debian/</a>                   alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
@@ -717,10 +719,11 @@ debian.unesr.edu.ve                                                      <a href
 <b>ZA South Africa</b>
 ---------------
 ftp.sun.ac.za                     <a href="ftp://ftp.sun.ac.za/debian/">/debian/</a>                               <a href="http://ftp.sun.ac.za/ftp/debian/">/ftp/debian/</a>                       amd64 i386
+debian.mirror.ac.za               <a href="ftp://debian.mirror.ac.za/debian/">/debian/</a>                               <a href="http://debian.mirror.ac.za/debian/">/debian/</a>                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 </small></pre><hr>
 <table border="0" width="100%"><tr>
-  <td align="left"><small>Last modified: Tue Mar 13 19:52:11 2007</small></td>
-  <td align="right"><small>Number of sites listed: 296</small></td>
+  <td align="left"><small>Last modified: Thu Apr  5 07:52:11 2007</small></td>
+  <td align="right"><small>Number of sites listed: 301</small></td>
 </tr></table>
 </body>
 </html>
diff --git a/includes/common/README.mirrors.txt b/includes/etch/install/README.mirrors.txt
index 86c74b0..31bbf0d 100644
--- a/includes/common/README.mirrors.txt
+++ b/includes/etch/install/README.mirrors.txt
@@ -40,12 +40,12 @@ Everything else you want to know about Debian mirrors:
  Country         Site                  Debian archive  Architectures
  ---------------------------------------------------------------------------
  Austria         ftp.at.debian.org     /debian/        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Australia       ftp.au.debian.org     /debian/        alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+ Australia       ftp.au.debian.org     /debian/        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
  Australia       ftp.wa.au.debian.org  /debian/        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
  Bulgaria        ftp.bg.debian.org     /debian/        alpha amd64 arm i386 ia64 m68k mips mipsel powerpc sparc
  Brazil          ftp.br.debian.org     /debian/        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
  Switzerland     ftp.ch.debian.org     /debian/        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
- Chile           ftp.cl.debian.org     /debian/        amd64 i386 powerpc
+ Chile           ftp.cl.debian.org     /debian/        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
  Czech Republic  ftp.cz.debian.org     /debian/        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
  Germany         ftp.de.debian.org     /debian/        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
  Germany         ftp2.de.debian.org    /debian/        alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
@@ -103,7 +103,7 @@ debian.inode.at                   /debian/                               /debian
 AU Australia
 ------------
 ftp.wa.au.debian.org              /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.au.debian.org                 /debian/                               /debian/                           alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+ftp.au.debian.org                 /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 mirror.aarnet.edu.au              /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.monash.edu.au                 /pub/linux/debian/                     /pub/linux/debian/                 amd64 i386
 ftp.uwa.edu.au                    /debian/                               /debian/                           amd64 i386
@@ -111,7 +111,7 @@ mirror.eftel.com                  /debian/                               /debian
 mirror.pacific.net.au             /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.iinet.net.au                  /debian/debian/                        /debian/debian/                    alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 mirror.datafast.net.au            /debian/                               /debian/                           amd64 i386
-mirror.optus.net                                                         /debian/                           amd64 i386
+mirror.optus.net                  /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 BE Belgium
 ----------
@@ -140,7 +140,7 @@ debian.pop-sc.rnp.br                                                     /debian
 
 BY Belarus
 ----------
-linux.org.by                                                             /debian/                           amd64 i386
+linux.org.by                      /debian/                               /debian/                           amd64 i386
 ftp.mgts.by                       /debian/                               /debian/                           amd64 i386
 
 CA Canada
@@ -161,7 +161,7 @@ mirror.switch.ch                  /mirror/debian/                        /ftp/mi
 
 CL Chile
 --------
-ftp.cl.debian.org                 /debian/                               /debian/                           amd64 i386 powerpc
+ftp.cl.debian.org                 /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 debian.ubiobio.cl                                                        /debian/                           amd64 i386 powerpc sparc
 
 CN China
@@ -184,7 +184,6 @@ ftp2.de.debian.org                /debian/                               /debian
 ftp.tu-clausthal.de               /pub/linux/debian/                                                        amd64 arm i386 ia64 m68k mips powerpc sparc
 debian.uni-essen.de               /debian/                               /debian/                           amd64 hurd-i386 i386 ia64 m68k mips mipsel powerpc sparc
 ftp.freenet.de                    /pub/ftp.debian.org/debian/            /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.uni-erlangen.de               /pub/Linux/debian/                     /pub/Linux/debian/                 alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 sunsite.informatik.rwth-aachen.de /pub/Linux/debian/                     /ftp/pub/Linux/debian/             alpha amd64 i386 powerpc sparc
 ftp-stud.fht-esslingen.de         /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.stw-bonn.de                   /debian/                               /debian/                           amd64 i386
@@ -206,6 +205,7 @@ debian.intergenia.de                                                     /debian
 debian.swordcoast.net             /debian/                               /debian/                           alpha amd64 arm hurd-i386 i386 ia64 m68k powerpc
 debian.cruisix.net                /debian/                               /debian/                           amd64 i386 powerpc
 ftp.rrzn.uni-hannover.de          /debian/debian/                                                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian-ftp.charite.de                                                    /debian/                           i386
 
 DK Denmark
 ----------
@@ -228,6 +228,7 @@ ftp.caliu.info                    /debian/                               /debian
 ftp.gva.es                        /pub/mirror/debian/                    /mirror/debian/                    alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.gul.uc3m.es                   /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.um.es                         /mirror/debian/                                                           all
+jane.uab.cat                      /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 FI Finland
 ----------
@@ -307,7 +308,6 @@ ftp.esat.net                      /pub/linux/debian/                     /pub/li
 IL Israel
 ---------
 mirror.hamakor.org.il                                                    /pub/mirrors/debian/               amd64 i386
-mirror.inter.net.il               /pub/debian/                           /pub/debian/                       amd64 i386 sparc
 debian.co.il                                                             /debian/                           amd64 i386
 
 IS Iceland
@@ -318,7 +318,7 @@ IT Italy
 --------
 ftp.it.debian.org                 /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.bononia.it                    /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-freedom.dicea.unifi.it                                                   /ftp/pub/linux/debian/             amd64 hurd-i386 i386
+freedom.dicea.unifi.it            /pub/linux/debian/                     /ftp/pub/linux/debian/             amd64 hurd-i386 i386
 ftp.eutelia.it                    /pub/Debian_Mirror/                                                       alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 mi.mirror.garr.it                 /mirrors/debian/                       /mirrors/debian/                   alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 debian.fastweb.it                 /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
@@ -334,8 +334,8 @@ ftp.dti.ad.jp                     /pub/Linux/debian/                     /pub/Li
 dennou-k.gfd-dennou.org           /library/Linux/debian/                 /library/Linux/debian/             alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 dennou-q.gfd-dennou.org           /library/Linux/debian/                 /library/Linux/debian/             alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.yz.yamagata-u.ac.jp           /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-sb.itc.u-tokyo.ac.jp              /DEBIAN/debian/                                                           amd64 hurd-i386 i386 powerpc
-ftp.riken.go.jp                   /pub/Linux/debian/debian/              /pub/Linux/debian/debian/          amd64 i386
+sb.itc.u-tokyo.ac.jp              /DEBIAN/                               /DEBIAN/                           amd64 hurd-i386 i386 powerpc
+ftp.riken.jp                      /pub/Linux/debian/debian/              /pub/Linux/debian/debian/          amd64 i386
 debian.shimpinomori.net                                                  /debian/                           amd64 i386 powerpc
 www.ring.gr.jp                    /pub/linux/debian/debian/              /archives/linux/debian/debian/     alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.jaist.ac.jp                   /pub/Linux/Debian/                     /pub/Linux/Debian/                 alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
@@ -412,6 +412,7 @@ ftp.se.debian.org                 /debian/                               /debian
 ftp.sunet.se                      /pub/os/Linux/distributions/debian/    /pub/os/Linux/distributions/debian/alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.port80.se                     /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.ds.hj.se                      /pub/os/linux/debian/                  /pub/os/linux/debian/              alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.bsnet.se                   /debian/                                                                  i386
 
 SG Singapore
 ------------
@@ -430,11 +431,11 @@ ftp.sk.debian.org                 /debian/                               /debian
 TH Thailand
 -----------
 ftp.coe.psu.ac.th                 /debian/                               /debian/                           i386
+ftp.thaios.net                                                           /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 TR Turkey
 ---------
 ftp.tr.debian.org                 /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-ftp.linux.org.tr                  /pub/mirrors/debian/                                                      amd64 i386
 godel.cs.bilgi.edu.tr                                                    /debian/                           hurd-i386 i386
 
 TW Taiwan
@@ -443,8 +444,9 @@ ftp.tw.debian.org                 /debian/                               /debian
 debian.csie.ntu.edu.tw            /pub/debian/                           /debian/                           amd64 hurd-i386 i386
 linux.cdpa.nsysu.edu.tw                                                  /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 opensource.nchc.org.tw            /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-debian.nctu.edu.tw                                                       /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.nctu.edu.tw                /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 mirror.nttu.edu.tw                /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
+debian.csie.nctu.edu.tw           /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 UA Ukraine
 ----------
@@ -462,7 +464,7 @@ distro.ibiblio.org                /pub/linux/distributions/debian/       /pub/li
 ftp-mirror.internap.com           /pub/debian/                           /pub/debian/                       alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.cerias.purdue.edu             /pub/os/debian/                        /pub/os/debian/                    amd64 i386
 ftp.cs.unm.edu                    /mirrors/debian/                                                          alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
-mirror.cs.wisc.edu                /pub/mirrors/linux/debian/                                                amd64 i386
+mirror.cs.wisc.edu                /pub/mirrors/linux/debian/             /pub/mirrors/linux/debian/         amd64 i386
 ftp.uwsg.indiana.edu              /linux/debian/                         /linux/debian/                     alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 natasha.stmarytx.edu              /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 ftp.ndlug.nd.edu                  /debian/                               /mirrors/debian/                   alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
@@ -501,6 +503,7 @@ debian.unesr.edu.ve                                                      /debian
 ZA South Africa
 ---------------
 ftp.sun.ac.za                     /debian/                               /ftp/debian/                       amd64 i386
+debian.mirror.ac.za               /debian/                               /debian/                           alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sparc
 
 -------------------------------------------------------------------------------
-Last modified: Tue Mar 13 19:52:11 2007             Number of sites listed: 296
+Last modified: Thu Apr  5 07:52:11 2007             Number of sites listed: 301
diff --git a/includes/common/README.txt b/includes/etch/install/README.txt
index e8ca61b..db1c7b2 100644
--- a/includes/common/README.txt
+++ b/includes/etch/install/README.txt
@@ -1,8 +1,8 @@
 

                                             (HTML version in README.html)

 

-         Debian GNU/Linux testing "Etch" - Official Beta i386 NETINST

-                         Binary-1 20070317-20:46   

+        DEBIAN_NAME

+                             DEBIAN_DATE   

 

 

 

@@ -38,10 +38,9 @@ Intro
    GNU project; hence the name GNU/Linux.

 

    Debian is available for various kinds of computers ("architectures"),

-   like "IBM-compatible" PCs (i386), Compaq's Alpha, Motorola's 680x0

-   (m68k), Sun's Sparc, Motorola/IBM's PowerPC, and (Strong)ARM

-   processors. Check the ports page (http://www.debian.org/ports) for

-   more information.

+   like "IBM-compatible" PCs (i386), Compaq's Alpha, Sun's Sparc,

+   Motorola/IBM's PowerPC, and (Strong)ARM processors. Check the ports

+   page (http://www.debian.org/ports) for more information.

 

    Read more at

 

@@ -53,11 +52,11 @@ About This Disc
 

    This disc is labeled

 

-     Debian GNU/Linux testing "Etch" - Official Beta i386 NETINST

-   Binary-1 20070317-20:46

+     DEBIAN_NAME

+   DEBIAN_DATE

 

    which means that this disc is number 1 of a set of 1 discs. It

-   contains programs ("binaries") for `i386' computers.

+   contains programs ("binaries") for `DEBIAN_ARCHITECTURE' computers.

 

    The programs on the Binary discs are ordered by popularity. The

    Binary-1 disc contains the most popular programs and the installation

@@ -81,13 +80,13 @@ Installing
    Programs and other files that are needed for the installation can be

    found on this disc under

 

-     /tools/ and   /install/floppy/

+     DEBIAN_TOOLS

 

    For the impatient ones: you can start the installation program easily

    by booting off this disc. Note that not all (esp. older) systems

    support this.

 

-   You can also examine the

+   You can examine the

 

      /install

 

@@ -98,9 +97,12 @@ Installing
 Last-Minute Notes

 =================

 

-     * You should keep in mind that this is a beta disc of the current

-       development version of the Debian system. This means that all

-       sorts of bugs may be present anywhere in the system.

+     * This is an official release of the Debian system. Please report

+       any bugs you find in the Debian Bug Tracking System; details at

+       [1]bugs.debian.org.

+     * If you're reporting bugs against this disc or the installation

+       system, please also mention the version of this disc; this can be

+       found in the file /.disk/info.

 

 

 

@@ -164,3 +166,7 @@ More Information
                        information on contacting us.

 

                 Last Modified: Sat Mar 20 12:30:45 EST 2004

+

+References

+

+   1. http://bugs.debian.org/

diff --git a/includes/iso/autorun.bat b/includes/etch/install/autorun.bat
index 4718afe..4718afe 100644
--- a/includes/iso/autorun.bat
+++ b/includes/etch/install/autorun.bat
diff --git a/includes/iso/autorun.inf b/includes/etch/install/autorun.inf
index 1b28f75..1b28f75 100644
--- a/includes/iso/autorun.inf
+++ b/includes/etch/install/autorun.inf
diff --git a/includes/common/doc/00-INDEX b/includes/etch/install/doc/00-INDEX
index 041eaca..041eaca 100644
--- a/includes/common/doc/00-INDEX
+++ b/includes/etch/install/doc/00-INDEX
diff --git a/includes/etch/install/doc/FAQ/debian-faq.en.html.tar.gz b/includes/etch/install/doc/FAQ/debian-faq.en.html.tar.gz
new file mode 100644
index 0000000..4deda61
--- /dev/null
+++ b/includes/etch/install/doc/FAQ/debian-faq.en.html.tar.gz
diff --git a/includes/etch/install/doc/FAQ/debian-faq.en.pdf.gz b/includes/etch/install/doc/FAQ/debian-faq.en.pdf.gz
new file mode 100644
index 0000000..265fe0f
--- /dev/null
+++ b/includes/etch/install/doc/FAQ/debian-faq.en.pdf.gz
diff --git a/includes/etch/install/doc/FAQ/debian-faq.en.ps.gz b/includes/etch/install/doc/FAQ/debian-faq.en.ps.gz
new file mode 100644
index 0000000..da90480
--- /dev/null
+++ b/includes/etch/install/doc/FAQ/debian-faq.en.ps.gz
diff --git a/includes/etch/install/doc/FAQ/debian-faq.en.txt.gz b/includes/etch/install/doc/FAQ/debian-faq.en.txt.gz
new file mode 100644
index 0000000..0543b2b
--- /dev/null
+++ b/includes/etch/install/doc/FAQ/debian-faq.en.txt.gz
diff --git a/includes/common/doc/FAQ/html/ch-basic_defs.en.html b/includes/etch/install/doc/FAQ/html/ch-basic_defs.en.html
index 7425706..aac1358 100644
--- a/includes/common/doc/FAQ/html/ch-basic_defs.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-basic_defs.en.html
@@ -116,7 +116,7 @@ Debian GNU/Linux is:
 <ul>
 <li>
 <p>
-<strong>full featured</strong>: Debian includes more than 15400 software
+<strong>full featured</strong>: Debian includes more than 18347 software
 packages at present.  Users can select which packages to install; Debian
 provides a tool for this purpose.  You can find a list and descriptions of the
 packages currently available in Debian at any of the Debian <code><a
@@ -135,7 +135,7 @@ License.
 </p>
 
 <p>
-The Debian FTP archives also carry approximately 450 software packages (in the
+The Debian FTP archives also carry approximately 444 software packages (in the
 <samp>non-free</samp> and <samp>contrib</samp> sections), which are
 distributable under specific terms included with each package.
 </p>
@@ -144,7 +144,7 @@ distributable under specific terms included with each package.
 <ul>
 <li>
 <p>
-<strong>dynamic</strong>: With about 1649 volunteers constantly contributing
+<strong>dynamic</strong>: With about 1950 volunteers constantly contributing
 new and improved code, Debian is evolving rapidly.  New releases are planned to
 be made every several months, and the FTP archives are updated daily.
 </p>
@@ -292,7 +292,7 @@ the same spirit as Linux and other free software.
 </p>
 
 <p>
-More than 1649 volunteer package maintainers are working on over 15400 packages
+More than 1950 volunteer package maintainers are working on over 18347 packages
 and improving Debian GNU/Linux.  The Debian developers contribute to the
 project not by writing new applications (in most cases), but by packaging
 existing software according to the standards of the project, by communicating
@@ -308,8 +308,8 @@ developer?, Section 12.1</a>.
 <dd>
 <p>
 Debian comes with <code><a href="http://packages.debian.org/stable/">more than
-15400 packages</a></code> and runs on <code><a
-href="http://www.debian.org/ports/">11 architectures</a></code>.  This is far
+18347 packages</a></code> and runs on <code><a
+href="http://www.debian.org/ports/">10 architectures</a></code>.  This is far
 more than is available for any other GNU/Linux distribution.  See <a
 href="ch-software.en.html#s-apps">What types of applications and development
 software are available for Debian GNU/Linux?, Section 4.1</a> for an overview
@@ -418,7 +418,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-basic_defs.html b/includes/etch/install/doc/FAQ/html/ch-basic_defs.html
index 7425706..aac1358 100644
--- a/includes/common/doc/FAQ/html/ch-basic_defs.html
+++ b/includes/etch/install/doc/FAQ/html/ch-basic_defs.html
@@ -116,7 +116,7 @@ Debian GNU/Linux is:
 <ul>
 <li>
 <p>
-<strong>full featured</strong>: Debian includes more than 15400 software
+<strong>full featured</strong>: Debian includes more than 18347 software
 packages at present.  Users can select which packages to install; Debian
 provides a tool for this purpose.  You can find a list and descriptions of the
 packages currently available in Debian at any of the Debian <code><a
@@ -135,7 +135,7 @@ License.
 </p>
 
 <p>
-The Debian FTP archives also carry approximately 450 software packages (in the
+The Debian FTP archives also carry approximately 444 software packages (in the
 <samp>non-free</samp> and <samp>contrib</samp> sections), which are
 distributable under specific terms included with each package.
 </p>
@@ -144,7 +144,7 @@ distributable under specific terms included with each package.
 <ul>
 <li>
 <p>
-<strong>dynamic</strong>: With about 1649 volunteers constantly contributing
+<strong>dynamic</strong>: With about 1950 volunteers constantly contributing
 new and improved code, Debian is evolving rapidly.  New releases are planned to
 be made every several months, and the FTP archives are updated daily.
 </p>
@@ -292,7 +292,7 @@ the same spirit as Linux and other free software.
 </p>
 
 <p>
-More than 1649 volunteer package maintainers are working on over 15400 packages
+More than 1950 volunteer package maintainers are working on over 18347 packages
 and improving Debian GNU/Linux.  The Debian developers contribute to the
 project not by writing new applications (in most cases), but by packaging
 existing software according to the standards of the project, by communicating
@@ -308,8 +308,8 @@ developer?, Section 12.1</a>.
 <dd>
 <p>
 Debian comes with <code><a href="http://packages.debian.org/stable/">more than
-15400 packages</a></code> and runs on <code><a
-href="http://www.debian.org/ports/">11 architectures</a></code>.  This is far
+18347 packages</a></code> and runs on <code><a
+href="http://www.debian.org/ports/">10 architectures</a></code>.  This is far
 more than is available for any other GNU/Linux distribution.  See <a
 href="ch-software.en.html#s-apps">What types of applications and development
 software are available for Debian GNU/Linux?, Section 4.1</a> for an overview
@@ -418,7 +418,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-compat.en.html b/includes/etch/install/doc/FAQ/html/ch-compat.en.html
index 24b527d..4e92270 100644
--- a/includes/common/doc/FAQ/html/ch-compat.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-compat.en.html
@@ -56,7 +56,7 @@ FAQ</a></code> for details.
 </p>
 
 <p>
-The current Debian GNU/Linux release, 3.1, contains a complete, binary
+The current Debian GNU/Linux release, 4.0, contains a complete, binary
 distribution for the following architectures:
 </p>
 
@@ -373,7 +373,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-compat.html b/includes/etch/install/doc/FAQ/html/ch-compat.html
index 24b527d..4e92270 100644
--- a/includes/common/doc/FAQ/html/ch-compat.html
+++ b/includes/etch/install/doc/FAQ/html/ch-compat.html
@@ -56,7 +56,7 @@ FAQ</a></code> for details.
 </p>
 
 <p>
-The current Debian GNU/Linux release, 3.1, contains a complete, binary
+The current Debian GNU/Linux release, 4.0, contains a complete, binary
 distribution for the following architectures:
 </p>
 
@@ -373,7 +373,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-contributing.en.html b/includes/etch/install/doc/FAQ/html/ch-contributing.en.html
index 9ed5a56..ae790ba 100644
--- a/includes/common/doc/FAQ/html/ch-contributing.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-contributing.en.html
@@ -178,7 +178,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-contributing.html b/includes/etch/install/doc/FAQ/html/ch-contributing.html
index 9ed5a56..ae790ba 100644
--- a/includes/common/doc/FAQ/html/ch-contributing.html
+++ b/includes/etch/install/doc/FAQ/html/ch-contributing.html
@@ -178,7 +178,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-customizing.en.html b/includes/etch/install/doc/FAQ/html/ch-customizing.en.html
index fb89888..0185e6c 100644
--- a/includes/common/doc/FAQ/html/ch-customizing.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-customizing.en.html
@@ -509,7 +509,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-customizing.html b/includes/etch/install/doc/FAQ/html/ch-customizing.html
index fb89888..0185e6c 100644
--- a/includes/common/doc/FAQ/html/ch-customizing.html
+++ b/includes/etch/install/doc/FAQ/html/ch-customizing.html
@@ -509,7 +509,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-faqinfo.en.html b/includes/etch/install/doc/FAQ/html/ch-faqinfo.en.html
index 6fdb982..1d4f43b 100644
--- a/includes/common/doc/FAQ/html/ch-faqinfo.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-faqinfo.en.html
@@ -197,7 +197,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-faqinfo.html b/includes/etch/install/doc/FAQ/html/ch-faqinfo.html
index 6fdb982..1d4f43b 100644
--- a/includes/common/doc/FAQ/html/ch-faqinfo.html
+++ b/includes/etch/install/doc/FAQ/html/ch-faqinfo.html
@@ -197,7 +197,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-ftparchives.en.html b/includes/etch/install/doc/FAQ/html/ch-ftparchives.en.html
index 0133507..6560f14 100644
--- a/includes/common/doc/FAQ/html/ch-ftparchives.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-ftparchives.en.html
@@ -138,10 +138,10 @@ again).
 </p>
 
 <p>
-Currently, <samp>stable</samp> is a symbolic link to <samp>sarge</samp> (i.e.
-Debian GNU/Linux 3.1) and <samp>testing</samp> is a symbolic link to
-<samp>etch</samp>.  This means that <samp>sarge</samp> is the current stable
-distribution and <samp>etch</samp> is the current testing distribution.
+Currently, <samp>stable</samp> is a symbolic link to <samp>etch</samp> (i.e.
+Debian GNU/Linux 4.0) and <samp>testing</samp> is a symbolic link to
+<samp>lenny</samp>.  This means that <samp>etch</samp> is the current stable
+distribution and <samp>lenny</samp> is the current testing distribution.
 </p>
 
 <p>
@@ -158,7 +158,8 @@ about &quot;sid&quot;?, Section 5.4</a>).
 Other codenames that have been already used are: <samp>buzz</samp> for release
 1.1, <samp>rex</samp> for release 1.2, <samp>bo</samp> for releases 1.3.x,
 <samp>hamm</samp> for release 2.0, <samp>slink</samp> for release 2.1,
-<samp>potato</samp> for release 2.2 and <samp>woody</samp> for release 3.0.
+<samp>potato</samp> for release 2.2, <samp>woody</samp> for release 3.0 and
+<samp>sarge</samp> for release 3.1.
 </p>
 
 <hr>
@@ -228,7 +229,14 @@ Pixar.
 <ul>
 <li>
 <p>
-<em>etch</em> was the toy blackboard (Etch-a-Sketch (R)).
+<em>etch</em> was the toy blackboard (Etch-a-Sketch (R)),
+</p>
+</li>
+</ul>
+<ul>
+<li>
+<p>
+<em>lenny</em> was the binoculars.
 </p>
 </li>
 </ul>
@@ -554,7 +562,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-ftparchives.html b/includes/etch/install/doc/FAQ/html/ch-ftparchives.html
index 0133507..6560f14 100644
--- a/includes/common/doc/FAQ/html/ch-ftparchives.html
+++ b/includes/etch/install/doc/FAQ/html/ch-ftparchives.html
@@ -138,10 +138,10 @@ again).
 </p>
 
 <p>
-Currently, <samp>stable</samp> is a symbolic link to <samp>sarge</samp> (i.e.
-Debian GNU/Linux 3.1) and <samp>testing</samp> is a symbolic link to
-<samp>etch</samp>.  This means that <samp>sarge</samp> is the current stable
-distribution and <samp>etch</samp> is the current testing distribution.
+Currently, <samp>stable</samp> is a symbolic link to <samp>etch</samp> (i.e.
+Debian GNU/Linux 4.0) and <samp>testing</samp> is a symbolic link to
+<samp>lenny</samp>.  This means that <samp>etch</samp> is the current stable
+distribution and <samp>lenny</samp> is the current testing distribution.
 </p>
 
 <p>
@@ -158,7 +158,8 @@ about &quot;sid&quot;?, Section 5.4</a>).
 Other codenames that have been already used are: <samp>buzz</samp> for release
 1.1, <samp>rex</samp> for release 1.2, <samp>bo</samp> for releases 1.3.x,
 <samp>hamm</samp> for release 2.0, <samp>slink</samp> for release 2.1,
-<samp>potato</samp> for release 2.2 and <samp>woody</samp> for release 3.0.
+<samp>potato</samp> for release 2.2, <samp>woody</samp> for release 3.0 and
+<samp>sarge</samp> for release 3.1.
 </p>
 
 <hr>
@@ -228,7 +229,14 @@ Pixar.
 <ul>
 <li>
 <p>
-<em>etch</em> was the toy blackboard (Etch-a-Sketch (R)).
+<em>etch</em> was the toy blackboard (Etch-a-Sketch (R)),
+</p>
+</li>
+</ul>
+<ul>
+<li>
+<p>
+<em>lenny</em> was the binoculars.
 </p>
 </li>
 </ul>
@@ -554,7 +562,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-getting.en.html b/includes/etch/install/doc/FAQ/html/ch-getting.en.html
index 5f608d5..fe19d08 100644
--- a/includes/common/doc/FAQ/html/ch-getting.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-getting.en.html
@@ -60,7 +60,7 @@ and installing Debian GNU/Linux here.
 Currently there are three versions of Debian GNU/Linux:
 </p>
 <dl>
-<dt><em>release 3.1, a.k.a. the `stable' distribution</em></dt>
+<dt><em>release 4.0, a.k.a. the `stable' distribution</em></dt>
 <dd>
 <p>
 This is stable and well tested software, it changes if major security or
@@ -361,7 +361,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-getting.html b/includes/etch/install/doc/FAQ/html/ch-getting.html
index 5f608d5..fe19d08 100644
--- a/includes/common/doc/FAQ/html/ch-getting.html
+++ b/includes/etch/install/doc/FAQ/html/ch-getting.html
@@ -60,7 +60,7 @@ and installing Debian GNU/Linux here.
 Currently there are three versions of Debian GNU/Linux:
 </p>
 <dl>
-<dt><em>release 3.1, a.k.a. the `stable' distribution</em></dt>
+<dt><em>release 4.0, a.k.a. the `stable' distribution</em></dt>
 <dd>
 <p>
 This is stable and well tested software, it changes if major security or
@@ -361,7 +361,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-kernel.en.html b/includes/etch/install/doc/FAQ/html/ch-kernel.en.html
index 5e88fad..28e150f 100644
--- a/includes/common/doc/FAQ/html/ch-kernel.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-kernel.en.html
@@ -70,7 +70,8 @@ tree of the newer kernel.  That is, if the kernel sources are in
 Users who wish to (or must) build a custom kernel are encouraged to download
 the package <code>kernel-package</code>.  This package contains the script to
 build the kernel package, and provides the capability to create a Debian
-kernel-image package just by running the command
+<code>kernel-image-<var>version</var></code> package just by running the
+command
 </p>
 
 <pre>
@@ -93,8 +94,8 @@ and through the manual page <code>make-kpkg(1)</code>.
 <p>
 Users must separately download the source code for the most recent kernel (or
 the kernel of their choice) from their favorite Linux archive site, unless a
-kernel-source-version package is available (where &quot;version&quot; stands
-for the kernel version).
+<code>kernel-source-<var>version</var></code> package is available (where
+<var>version</var> stands for the kernel version).
 </p>
 
 <p>
@@ -117,7 +118,7 @@ Modify the kernel configuration using one of these commands:
 <ul>
 <li>
 <p>
-<samp>make config</samp> (for a tty one-line-at-a-time-interface).
+<samp>make config</samp> (for a text-based interface).
 </p>
 </li>
 </ul>
@@ -148,11 +149,11 @@ kernel source directory.
 <ul>
 <li>
 <p>
-Execute the command: <samp>make-kpkg -rev Custom.N kernel_image</samp>, where N
-is a revision number assigned by the user.  The new Debian archive thus formed
-would have revision Custom.1, e.g.,
-<samp>kernel-image-2.2.14_Custom.1_i386.deb</samp> for the Linux kernel 2.2.14
-on i386.
+Execute the command: <samp>make-kpkg -rev Custom.<var>N</var>
+kernel_image</samp>, where <var>N</var> is a revision number assigned by the
+user.  The new Debian archive thus formed would have revision
+Custom.<var>N</var>, e.g.  <code>kernel-image-2.2.14_Custom.1_i386.deb</code>
+for the Linux kernel 2.2.14 on i386.
 </p>
 </li>
 </ul>
@@ -164,8 +165,9 @@ Install the package created.
 <ul>
 <li>
 <p>
-<samp>Run dpkg --install /usr/src/kernel-image-VVV_Custom.N.deb</samp> to
-install the kernel itself.  The installation script will:
+Run <samp>dpkg --install
+../kernel-image-<var>VVV</var>_Custom.<var>N</var>_i386.deb</samp> to install
+the kernel itself.  The installation script will:
 </p>
 <ul>
 <li>
@@ -177,8 +179,9 @@ run the boot loader (grub, LILO or some other) if needed,
 <ul>
 <li>
 <p>
-install the custom kernel in /boot/vmlinuz_VVV-Custom.N, and set up appropriate
-symbolic links to the most recent kernel version.
+install the custom kernel in
+<code>/boot/vmlinuz_<var>VVV</var>-Custom.<var>N</var></code>, and set up
+appropriate symbolic links to the most recent kernel version.
 </p>
 </li>
 </ul>
@@ -196,7 +199,7 @@ floppy?, Section 9.3</a>.
 <ul>
 <li>
 <p>
-To employ secondary boot loaders such as <samp>loadlin</samp>, copy this image
+To employ secondary boot loaders such as <code>loadlin</code>, copy this image
 to other locations (e.g.  to an <samp>MS-DOS</samp> partition).
 </p>
 </li>
@@ -214,14 +217,14 @@ normally found in the <samp>admin</samp> section of the Debian FTP archive.
 Shell scripts in this package produce boot floppies in the
 <samp>SYSLINUX</samp> format.  These are <samp>MS-DOS</samp> formatted floppies
 whose master boot records have been altered so that they boot Linux directly
-(or whatever other operating system has been defined in the syslinux.cfg file
-on the floppy).  Other scripts in this package produce emergency root disks and
-can even reproduce the base disks.
+(or whatever other operating system has been defined in the
+<code>syslinux.cfg</code> file on the floppy).  Other scripts in this package
+produce emergency root disks and can even reproduce the base disks.
 </p>
 
 <p>
 You will find more information about this in the
-<samp>/usr/share/doc/boot-floppies/README</samp> file after installing the
+<code>/usr/share/doc/boot-floppies/README</code> file after installing the
 <code>boot-floppies</code> package.
 </p>
 
@@ -231,21 +234,22 @@ You will find more information about this in the
 
 <p>
 Debian's <code>modconf</code> package provides a shell script
-(<samp>/usr/sbin/modconf</samp>) which can be used to customize the
+(<code>/usr/sbin/modconf</code>) which can be used to customize the
 configuration of modules.  This script presents a menu-based interface,
 prompting the user for particulars on the loadable device drivers in his
 system.  The responses are used to customize the file
-<samp>/etc/modules.conf</samp> (which lists aliases, and other arguments that
+<code>/etc/modules.conf</code> (which lists aliases, and other arguments that
 must be used in conjunction with various modules) through files in
-<samp>/etc/modutils/</samp>, and <samp>/etc/modules</samp> (which lists the
+<code>/etc/modutils/</code>, and <code>/etc/modules</code> (which lists the
 modules that must be loaded at boot time).
 </p>
 
 <p>
-Like the (new) Configure.help files that are now available to support the
-construction of custom kernels, the modconf package comes with a series of help
-files (in <samp>/usr/lib/modules_help/</samp>) which provide detailed
-information on appropriate arguments for each of the modules.
+Like the (new) <code>Configure.help</code> files that are now available to
+support the construction of custom kernels, the <code>modconf</code> package
+comes with a series of help files (in <code>/usr/lib/modules_help/</code>)
+which provide detailed information on appropriate arguments for each of the
+modules.
 </p>
 
 <hr>
@@ -253,18 +257,18 @@ information on appropriate arguments for each of the modules.
 <h2><a name="s-removeoldkernel"></a>9.5 Can I safely de-install an old kernel package, and if so, how?</h2>
 
 <p>
-Yes.  The <samp>kernel-image-NNN.prerm</samp> script checks to see whether the
-kernel you are currently running is the same as the kernel you are trying to
-de-install.  Therefore you can remove unwanted kernel image packages using this
-command:
+Yes.  The <code>kernel-image-<var>NNN</var>.prerm</code> script checks to see
+whether the kernel you are currently running is the same as the kernel you are
+trying to de-install.  Therefore you can remove unwanted kernel image packages
+using this command:
 </p>
 
 <pre>
-     dpkg --purge --force-remove-essential kernel-image-NNN
+     dpkg --purge --force-remove-essential kernel-image-<var>NNN</var>
 </pre>
 
 <p>
-(replace &quot;NNN&quot; with your kernel version and revision number, of
+(replace <var>NNN</var> with your kernel version and revision number, of
 course)
 </p>
 
@@ -298,7 +302,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-kernel.html b/includes/etch/install/doc/FAQ/html/ch-kernel.html
index 5e88fad..28e150f 100644
--- a/includes/common/doc/FAQ/html/ch-kernel.html
+++ b/includes/etch/install/doc/FAQ/html/ch-kernel.html
@@ -70,7 +70,8 @@ tree of the newer kernel.  That is, if the kernel sources are in
 Users who wish to (or must) build a custom kernel are encouraged to download
 the package <code>kernel-package</code>.  This package contains the script to
 build the kernel package, and provides the capability to create a Debian
-kernel-image package just by running the command
+<code>kernel-image-<var>version</var></code> package just by running the
+command
 </p>
 
 <pre>
@@ -93,8 +94,8 @@ and through the manual page <code>make-kpkg(1)</code>.
 <p>
 Users must separately download the source code for the most recent kernel (or
 the kernel of their choice) from their favorite Linux archive site, unless a
-kernel-source-version package is available (where &quot;version&quot; stands
-for the kernel version).
+<code>kernel-source-<var>version</var></code> package is available (where
+<var>version</var> stands for the kernel version).
 </p>
 
 <p>
@@ -117,7 +118,7 @@ Modify the kernel configuration using one of these commands:
 <ul>
 <li>
 <p>
-<samp>make config</samp> (for a tty one-line-at-a-time-interface).
+<samp>make config</samp> (for a text-based interface).
 </p>
 </li>
 </ul>
@@ -148,11 +149,11 @@ kernel source directory.
 <ul>
 <li>
 <p>
-Execute the command: <samp>make-kpkg -rev Custom.N kernel_image</samp>, where N
-is a revision number assigned by the user.  The new Debian archive thus formed
-would have revision Custom.1, e.g.,
-<samp>kernel-image-2.2.14_Custom.1_i386.deb</samp> for the Linux kernel 2.2.14
-on i386.
+Execute the command: <samp>make-kpkg -rev Custom.<var>N</var>
+kernel_image</samp>, where <var>N</var> is a revision number assigned by the
+user.  The new Debian archive thus formed would have revision
+Custom.<var>N</var>, e.g.  <code>kernel-image-2.2.14_Custom.1_i386.deb</code>
+for the Linux kernel 2.2.14 on i386.
 </p>
 </li>
 </ul>
@@ -164,8 +165,9 @@ Install the package created.
 <ul>
 <li>
 <p>
-<samp>Run dpkg --install /usr/src/kernel-image-VVV_Custom.N.deb</samp> to
-install the kernel itself.  The installation script will:
+Run <samp>dpkg --install
+../kernel-image-<var>VVV</var>_Custom.<var>N</var>_i386.deb</samp> to install
+the kernel itself.  The installation script will:
 </p>
 <ul>
 <li>
@@ -177,8 +179,9 @@ run the boot loader (grub, LILO or some other) if needed,
 <ul>
 <li>
 <p>
-install the custom kernel in /boot/vmlinuz_VVV-Custom.N, and set up appropriate
-symbolic links to the most recent kernel version.
+install the custom kernel in
+<code>/boot/vmlinuz_<var>VVV</var>-Custom.<var>N</var></code>, and set up
+appropriate symbolic links to the most recent kernel version.
 </p>
 </li>
 </ul>
@@ -196,7 +199,7 @@ floppy?, Section 9.3</a>.
 <ul>
 <li>
 <p>
-To employ secondary boot loaders such as <samp>loadlin</samp>, copy this image
+To employ secondary boot loaders such as <code>loadlin</code>, copy this image
 to other locations (e.g.  to an <samp>MS-DOS</samp> partition).
 </p>
 </li>
@@ -214,14 +217,14 @@ normally found in the <samp>admin</samp> section of the Debian FTP archive.
 Shell scripts in this package produce boot floppies in the
 <samp>SYSLINUX</samp> format.  These are <samp>MS-DOS</samp> formatted floppies
 whose master boot records have been altered so that they boot Linux directly
-(or whatever other operating system has been defined in the syslinux.cfg file
-on the floppy).  Other scripts in this package produce emergency root disks and
-can even reproduce the base disks.
+(or whatever other operating system has been defined in the
+<code>syslinux.cfg</code> file on the floppy).  Other scripts in this package
+produce emergency root disks and can even reproduce the base disks.
 </p>
 
 <p>
 You will find more information about this in the
-<samp>/usr/share/doc/boot-floppies/README</samp> file after installing the
+<code>/usr/share/doc/boot-floppies/README</code> file after installing the
 <code>boot-floppies</code> package.
 </p>
 
@@ -231,21 +234,22 @@ You will find more information about this in the
 
 <p>
 Debian's <code>modconf</code> package provides a shell script
-(<samp>/usr/sbin/modconf</samp>) which can be used to customize the
+(<code>/usr/sbin/modconf</code>) which can be used to customize the
 configuration of modules.  This script presents a menu-based interface,
 prompting the user for particulars on the loadable device drivers in his
 system.  The responses are used to customize the file
-<samp>/etc/modules.conf</samp> (which lists aliases, and other arguments that
+<code>/etc/modules.conf</code> (which lists aliases, and other arguments that
 must be used in conjunction with various modules) through files in
-<samp>/etc/modutils/</samp>, and <samp>/etc/modules</samp> (which lists the
+<code>/etc/modutils/</code>, and <code>/etc/modules</code> (which lists the
 modules that must be loaded at boot time).
 </p>
 
 <p>
-Like the (new) Configure.help files that are now available to support the
-construction of custom kernels, the modconf package comes with a series of help
-files (in <samp>/usr/lib/modules_help/</samp>) which provide detailed
-information on appropriate arguments for each of the modules.
+Like the (new) <code>Configure.help</code> files that are now available to
+support the construction of custom kernels, the <code>modconf</code> package
+comes with a series of help files (in <code>/usr/lib/modules_help/</code>)
+which provide detailed information on appropriate arguments for each of the
+modules.
 </p>
 
 <hr>
@@ -253,18 +257,18 @@ information on appropriate arguments for each of the modules.
 <h2><a name="s-removeoldkernel"></a>9.5 Can I safely de-install an old kernel package, and if so, how?</h2>
 
 <p>
-Yes.  The <samp>kernel-image-NNN.prerm</samp> script checks to see whether the
-kernel you are currently running is the same as the kernel you are trying to
-de-install.  Therefore you can remove unwanted kernel image packages using this
-command:
+Yes.  The <code>kernel-image-<var>NNN</var>.prerm</code> script checks to see
+whether the kernel you are currently running is the same as the kernel you are
+trying to de-install.  Therefore you can remove unwanted kernel image packages
+using this command:
 </p>
 
 <pre>
-     dpkg --purge --force-remove-essential kernel-image-NNN
+     dpkg --purge --force-remove-essential kernel-image-<var>NNN</var>
 </pre>
 
 <p>
-(replace &quot;NNN&quot; with your kernel version and revision number, of
+(replace <var>NNN</var> with your kernel version and revision number, of
 course)
 </p>
 
@@ -298,7 +302,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-nexttime.en.html b/includes/etch/install/doc/FAQ/html/ch-nexttime.en.html
index 0c1d3ec..2df0e3f 100644
--- a/includes/common/doc/FAQ/html/ch-nexttime.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-nexttime.en.html
@@ -56,10 +56,9 @@ is available, and initially set to authenticate via shadow password.
 </p>
 
 <p>
-Including full support for advanced authentication methods such as Kerberos, as
-well as additional security enhancements for mandatory access control
-mechanisms such as SElinux, RSBAC and buffer overflow protection like
-Exec-shield or PaX is still in progress.
+Including full support for additional security enhancements for mandatory
+access control mechanisms such as SElinux, RSBAC and buffer overflow protection
+like Exec-shield or PaX is still in progress.
 </p>
 
 <hr>
@@ -91,10 +90,9 @@ works on internationalizing the GNU programs.
 
 <p>
 Complete Debian system on other architectures such as AMD64 or SuperH is
-expected soon.  Notice that, for AMD64 there is a development archive at
-<code><a href="http://amd64.debian.net/">http://amd64.debian.net/</a></code>
-that provides intallation images as well as binary packages for most of the
-distribution.  This architecture will probably be added for <samp>etch</samp>.
+expected soon.  Notice that even though some architectures are dropped for a
+given the release there still might be a way to install and upgrade using the
+latest <samp>sid</samp>.
 </p>
 
 <hr>
@@ -136,7 +134,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-nexttime.html b/includes/etch/install/doc/FAQ/html/ch-nexttime.html
index 0c1d3ec..2df0e3f 100644
--- a/includes/common/doc/FAQ/html/ch-nexttime.html
+++ b/includes/etch/install/doc/FAQ/html/ch-nexttime.html
@@ -56,10 +56,9 @@ is available, and initially set to authenticate via shadow password.
 </p>
 
 <p>
-Including full support for advanced authentication methods such as Kerberos, as
-well as additional security enhancements for mandatory access control
-mechanisms such as SElinux, RSBAC and buffer overflow protection like
-Exec-shield or PaX is still in progress.
+Including full support for additional security enhancements for mandatory
+access control mechanisms such as SElinux, RSBAC and buffer overflow protection
+like Exec-shield or PaX is still in progress.
 </p>
 
 <hr>
@@ -91,10 +90,9 @@ works on internationalizing the GNU programs.
 
 <p>
 Complete Debian system on other architectures such as AMD64 or SuperH is
-expected soon.  Notice that, for AMD64 there is a development archive at
-<code><a href="http://amd64.debian.net/">http://amd64.debian.net/</a></code>
-that provides intallation images as well as binary packages for most of the
-distribution.  This architecture will probably be added for <samp>etch</samp>.
+expected soon.  Notice that even though some architectures are dropped for a
+given the release there still might be a way to install and upgrade using the
+latest <samp>sid</samp>.
 </p>
 
 <hr>
@@ -136,7 +134,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-pkg_basics.en.html b/includes/etch/install/doc/FAQ/html/ch-pkg_basics.en.html
index 0ebd3fe..a26e8ee 100644
--- a/includes/common/doc/FAQ/html/ch-pkg_basics.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-pkg_basics.en.html
@@ -425,16 +425,19 @@ applications.  These packages only constitute the bare infrastructure.
 <li>
 <p>
 <strong>Standard</strong> packages are standard on any Linux system, including
-a reasonably small but not too limited character-mode system.
+a reasonably small but not too limited character-mode system.  Tools are
+included to be able to browse the web (using w3m), send e-mail (with mutt) and
+download files from FTP servers.
 </p>
 
 <p>
 This is what will install by default if users do not select anything else.  It
-does not include many large applications, but it does include some development
-software like the GNU C and C++ compilers (<samp>gcc</samp>, <samp>g++</samp>),
-GNU make, as well as the Python interpreter and some server software like
-OpenSSH, the BSD printer daemon (<samp>lpr</samp>) and the RPC portmapper
-(<samp>portmap</samp>).
+does not include many large applications, but it does include the Python
+interpreter and some server software like OpenSSH (for remote administration),
+Exim (for mail delivery, although it can be configured for local delivery
+only), an identd server (pidentd) and the RPC portmapper
+(<samp>portmap</samp>).  It also includes some common generic documentation
+that most users will find helpful.
 </p>
 </li>
 </ul>
@@ -847,7 +850,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-pkg_basics.html b/includes/etch/install/doc/FAQ/html/ch-pkg_basics.html
index 0ebd3fe..a26e8ee 100644
--- a/includes/common/doc/FAQ/html/ch-pkg_basics.html
+++ b/includes/etch/install/doc/FAQ/html/ch-pkg_basics.html
@@ -425,16 +425,19 @@ applications.  These packages only constitute the bare infrastructure.
 <li>
 <p>
 <strong>Standard</strong> packages are standard on any Linux system, including
-a reasonably small but not too limited character-mode system.
+a reasonably small but not too limited character-mode system.  Tools are
+included to be able to browse the web (using w3m), send e-mail (with mutt) and
+download files from FTP servers.
 </p>
 
 <p>
 This is what will install by default if users do not select anything else.  It
-does not include many large applications, but it does include some development
-software like the GNU C and C++ compilers (<samp>gcc</samp>, <samp>g++</samp>),
-GNU make, as well as the Python interpreter and some server software like
-OpenSSH, the BSD printer daemon (<samp>lpr</samp>) and the RPC portmapper
-(<samp>portmap</samp>).
+does not include many large applications, but it does include the Python
+interpreter and some server software like OpenSSH (for remote administration),
+Exim (for mail delivery, although it can be configured for local delivery
+only), an identd server (pidentd) and the RPC portmapper
+(<samp>portmap</samp>).  It also includes some common generic documentation
+that most users will find helpful.
 </p>
 </li>
 </ul>
@@ -847,7 +850,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-pkgtools.en.html b/includes/etch/install/doc/FAQ/html/ch-pkgtools.en.html
index 114bb9f..2183ae9 100644
--- a/includes/common/doc/FAQ/html/ch-pkgtools.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-pkgtools.en.html
@@ -535,7 +535,7 @@ install (or remove).
 
 <p>
 The top part of the screen is a relatively narrow window into the list of
-Debian's 15400 packages; the bottom part of the screen contains description of
+Debian's 18347 packages; the bottom part of the screen contains description of
 the package or group of packages which are highlighted above.
 </p>
 
@@ -833,7 +833,7 @@ This searches for files which contain the substring <samp>foo</samp> in their
 full path names.  The files <samp>Contents-ARCH.gz</samp> (where ARCH
 represents the wanted architecture) reside in the major package directories
 (main, non-free, contrib) at a Debian FTP site (i.e.  under
-<samp>/debian/dists/sarge</samp>).  A <samp>Contents</samp> file refers only to
+<samp>/debian/dists/etch</samp>).  A <samp>Contents</samp> file refers only to
 the packages in the subdirectory tree where it resides.  Therefore, a user
 might have to search more than one <samp>Contents</samp> files to find the
 package containing the file <samp>foo</samp>.
@@ -923,7 +923,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-pkgtools.html b/includes/etch/install/doc/FAQ/html/ch-pkgtools.html
index 114bb9f..2183ae9 100644
--- a/includes/common/doc/FAQ/html/ch-pkgtools.html
+++ b/includes/etch/install/doc/FAQ/html/ch-pkgtools.html
@@ -535,7 +535,7 @@ install (or remove).
 
 <p>
 The top part of the screen is a relatively narrow window into the list of
-Debian's 15400 packages; the bottom part of the screen contains description of
+Debian's 18347 packages; the bottom part of the screen contains description of
 the package or group of packages which are highlighted above.
 </p>
 
@@ -833,7 +833,7 @@ This searches for files which contain the substring <samp>foo</samp> in their
 full path names.  The files <samp>Contents-ARCH.gz</samp> (where ARCH
 represents the wanted architecture) reside in the major package directories
 (main, non-free, contrib) at a Debian FTP site (i.e.  under
-<samp>/debian/dists/sarge</samp>).  A <samp>Contents</samp> file refers only to
+<samp>/debian/dists/etch</samp>).  A <samp>Contents</samp> file refers only to
 the packages in the subdirectory tree where it resides.  Therefore, a user
 might have to search more than one <samp>Contents</samp> files to find the
 package containing the file <samp>foo</samp>.
@@ -923,7 +923,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-redistrib.en.html b/includes/etch/install/doc/FAQ/html/ch-redistrib.en.html
index f0ac5d0..8242553 100644
--- a/includes/common/doc/FAQ/html/ch-redistrib.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-redistrib.en.html
@@ -157,7 +157,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-redistrib.html b/includes/etch/install/doc/FAQ/html/ch-redistrib.html
index f0ac5d0..8242553 100644
--- a/includes/common/doc/FAQ/html/ch-redistrib.html
+++ b/includes/etch/install/doc/FAQ/html/ch-redistrib.html
@@ -157,7 +157,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-software.en.html b/includes/etch/install/doc/FAQ/html/ch-software.en.html
index bedb65f..afb823b 100644
--- a/includes/common/doc/FAQ/html/ch-software.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-software.en.html
@@ -104,10 +104,10 @@ calendars.
 </ul>
 
 <p>
-More than 15180 packages, ranging from news servers and readers to sound
+More than 18138 packages, ranging from news servers and readers to sound
 support, FAX programs, database and spreadsheet programs, image processing
 programs, communications, net, and mail utilities, Web servers, and even
-ham-radio programs are included in the distribution.  Another 450 software
+ham-radio programs are included in the distribution.  Another 444 software
 suites are available as Debian packages, but are not formally part of Debian
 due to license restrictions.
 </p>
@@ -180,24 +180,15 @@ X is a whole number).
 <h2><a name="s-java"></a>4.6 (How) Does Debian support Java?</h2>
 
 <p>
-Since the official Java Development kit and Runtime Environment from Sun
-Microsystems is non-free software, even undistributeable by Debian, it cannot
-properly be included in Debian.  If you want those installed anyway, please
-refer to the <code>java-package</code> package in contrib.
-</p>
-
-<p>
-However, both the JDK and several <em>free</em> implementations of Java
-technology are available as Debian packages.  You can write, debug and run Java
-programs using Debian.
+Several <em>free</em> implementations of Java technology are available as
+Debian packages, providing both Java Development Kits as well as Runtime
+Environments.  You can write, debug and run Java programs using Debian.
 </p>
 
 <p>
 Running a Java applet requires a web browser with the capability to recognize
 and execute them.  Several web browsers available in Debian, such as Mozilla or
 Konqueror, support Java plug-ins that enable running Java applets within them.
-Netscape Navigator, while non-free, is also available as a Debian package and
-it can run Java applets.
 </p>
 
 <p>
@@ -397,7 +388,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-software.html b/includes/etch/install/doc/FAQ/html/ch-software.html
index bedb65f..afb823b 100644
--- a/includes/common/doc/FAQ/html/ch-software.html
+++ b/includes/etch/install/doc/FAQ/html/ch-software.html
@@ -104,10 +104,10 @@ calendars.
 </ul>
 
 <p>
-More than 15180 packages, ranging from news servers and readers to sound
+More than 18138 packages, ranging from news servers and readers to sound
 support, FAX programs, database and spreadsheet programs, image processing
 programs, communications, net, and mail utilities, Web servers, and even
-ham-radio programs are included in the distribution.  Another 450 software
+ham-radio programs are included in the distribution.  Another 444 software
 suites are available as Debian packages, but are not formally part of Debian
 due to license restrictions.
 </p>
@@ -180,24 +180,15 @@ X is a whole number).
 <h2><a name="s-java"></a>4.6 (How) Does Debian support Java?</h2>
 
 <p>
-Since the official Java Development kit and Runtime Environment from Sun
-Microsystems is non-free software, even undistributeable by Debian, it cannot
-properly be included in Debian.  If you want those installed anyway, please
-refer to the <code>java-package</code> package in contrib.
-</p>
-
-<p>
-However, both the JDK and several <em>free</em> implementations of Java
-technology are available as Debian packages.  You can write, debug and run Java
-programs using Debian.
+Several <em>free</em> implementations of Java technology are available as
+Debian packages, providing both Java Development Kits as well as Runtime
+Environments.  You can write, debug and run Java programs using Debian.
 </p>
 
 <p>
 Running a Java applet requires a web browser with the capability to recognize
 and execute them.  Several web browsers available in Debian, such as Mozilla or
 Konqueror, support Java plug-ins that enable running Java applets within them.
-Netscape Navigator, while non-free, is also available as a Debian package and
-it can run Java applets.
 </p>
 
 <p>
@@ -397,7 +388,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-support.en.html b/includes/etch/install/doc/FAQ/html/ch-support.en.html
index 57e21da..f910fe7 100644
--- a/includes/common/doc/FAQ/html/ch-support.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-support.en.html
@@ -512,7 +512,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-support.html b/includes/etch/install/doc/FAQ/html/ch-support.html
index 57e21da..f910fe7 100644
--- a/includes/common/doc/FAQ/html/ch-support.html
+++ b/includes/etch/install/doc/FAQ/html/ch-support.html
@@ -512,7 +512,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-uptodate.en.html b/includes/etch/install/doc/FAQ/html/ch-uptodate.en.html
index b271f29..180431b 100644
--- a/includes/common/doc/FAQ/html/ch-uptodate.en.html
+++ b/includes/etch/install/doc/FAQ/html/ch-uptodate.en.html
@@ -466,7 +466,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/ch-uptodate.html b/includes/etch/install/doc/FAQ/html/ch-uptodate.html
index b271f29..180431b 100644
--- a/includes/common/doc/FAQ/html/ch-uptodate.html
+++ b/includes/etch/install/doc/FAQ/html/ch-uptodate.html
@@ -466,7 +466,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/footnotes.en.html b/includes/etch/install/doc/FAQ/html/footnotes.en.html
index 0d5b7d4..37d57bb 100644
--- a/includes/common/doc/FAQ/html/footnotes.en.html
+++ b/includes/etch/install/doc/FAQ/html/footnotes.en.html
@@ -99,7 +99,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/common/doc/FAQ/html/footnotes.html b/includes/etch/install/doc/FAQ/html/footnotes.html
index 0d5b7d4..37d57bb 100644
--- a/includes/common/doc/FAQ/html/footnotes.html
+++ b/includes/etch/install/doc/FAQ/html/footnotes.html
@@ -99,7 +99,7 @@ The Debian GNU/Linux FAQ
 </p>
 
 <address>
-version 3.1.3, 25 April 2006<br>
+version 3.1.5, 17 January 2007<br>
 <br>
 Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
 <br>
diff --git a/includes/etch/install/doc/FAQ/html/index.en.html b/includes/etch/install/doc/FAQ/html/index.en.html
new file mode 100644
index 0000000..7adba8c
--- /dev/null
+++ b/includes/etch/install/doc/FAQ/html/index.en.html
@@ -0,0 +1,311 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+
+<html>
+
+<head>
+
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+
+<title>The Debian GNU/Linux FAQ</title>
+
+</head>
+
+<body>
+
+<p><a name="index"></a></p>
+<hr>
+
+<p>
+[ <a href="ch-faqinfo.en.html">previous</a> ]
+[ <a href="#contents">Contents</a> ]
+[ <a href="ch-basic_defs.en.html">1</a> ]
+[ <a href="ch-getting.en.html">2</a> ]
+[ <a href="ch-compat.en.html">3</a> ]
+[ <a href="ch-software.en.html">4</a> ]
+[ <a href="ch-ftparchives.en.html">5</a> ]
+[ <a href="ch-pkg_basics.en.html">6</a> ]
+[ <a href="ch-pkgtools.en.html">7</a> ]
+[ <a href="ch-uptodate.en.html">8</a> ]
+[ <a href="ch-kernel.en.html">9</a> ]
+[ <a href="ch-customizing.en.html">10</a> ]
+[ <a href="ch-support.en.html">11</a> ]
+[ <a href="ch-contributing.en.html">12</a> ]
+[ <a href="ch-redistrib.en.html">13</a> ]
+[ <a href="ch-nexttime.en.html">14</a> ]
+[ <a href="ch-faqinfo.en.html">15</a> ]
+[ <a href="ch-basic_defs.en.html">next</a> ]
+</p>
+
+<hr>
+
+<h1>
+The Debian GNU/Linux FAQ
+<br></h1>
+
+<hr>
+
+<h2><a name="abstract"></a>Abstract</h2>
+
+<p>
+This document answers questions frequently asked about Debian GNU/Linux.
+</p>
+
+<hr>
+
+<h2><a name="copyright"></a>Copyright Notice</h2>
+
+<p>
+Copyright &copy; 1996-2005 by Software in the Public Interest
+</p>
+
+<p>
+Permission is granted to make and distribute verbatim copies of this document
+provided the copyright notice and this permission notice are preserved on all
+copies.
+</p>
+
+<p>
+Permission is granted to copy and distribute modified versions of this document
+under the conditions for verbatim copying, provided that the entire resulting
+derived work is distributed under the terms of a permission notice identical to
+this one.
+</p>
+
+<p>
+Permission is granted to copy and distribute translations of this document into
+another language, under the above conditions for modified versions, except that
+this permission notice may be included in translations approved by the Free
+Software Foundation instead of in the original English.
+</p>
+
+<hr>
+
+<h2><a name="contents"></a>Contents</h2>
+
+<ul>
+<li><a href="ch-basic_defs.en.html">1 Definitions and overview</a>
+  <ul>
+  <li><a href="ch-basic_defs.en.html#s-whatisfaq">1.1 What is this FAQ?</a></li>
+  <li><a href="ch-basic_defs.en.html#s-whatisdebian">1.2 What is Debian GNU/Linux?</a></li>
+  <li><a href="ch-basic_defs.en.html#s-linux">1.3 OK, now I know what Debian is... what is Linux?!</a></li>
+  <li><a href="ch-basic_defs.en.html#s-non-linux">1.4 Does Debian just do GNU/Linux?</a></li>
+  <li><a href="ch-basic_defs.en.html#s-difference">1.5 What is the difference between Debian GNU/Linux and other Linux distributions? Why should I choose Debian over some other distribution?</a></li>
+  <li><a href="ch-basic_defs.en.html#s-gnu">1.6 How does the Debian project fit in or compare with the Free Software Foundation's GNU project?</a></li>
+  <li><a href="ch-basic_defs.en.html#s-pronunciation">1.7 How does one pronounce Debian and what does this word mean?</a>
+  </ul></li>
+<li><a href="ch-getting.en.html">2 Getting and installing Debian GNU/Linux</a>
+  <ul>
+  <li><a href="ch-getting.en.html#s-version">2.1 What is the latest version of Debian?</a></li>
+  <li><a href="ch-getting.en.html#s-updatestable">2.2 Are there package upgrades in `stable'?</a></li>
+  <li><a href="ch-getting.en.html#s-boot-floppies">2.3 Where/how can I get the Debian installation disks?</a></li>
+  <li><a href="ch-getting.en.html#s-cdrom">2.4 How do I install the Debian from CD-ROMs?</a></li>
+  <li><a href="ch-getting.en.html#s-cdimage-symlinks">2.5 Why does the official stable released CD-ROM contain symlinks for `frozen' and `unstable'? I thought this CD contains just `stable'!</a></li>
+  <li><a href="ch-getting.en.html#s-cdimages">2.6 I have my own CD-writer, are there CD images available somewhere?</a></li>
+  <li><a href="ch-getting.en.html#s-floppy">2.7 Can I install it from a pile of floppy disks?</a></li>
+  <li><a href="ch-getting.en.html#s-remoteinstall">2.8 Can I get and install Debian directly from a remote Internet site?</a>
+  </ul></li>
+<li><a href="ch-compat.en.html">3 Compatibility issues</a>
+  <ul>
+  <li><a href="ch-compat.en.html#s-arches">3.1 On what hardware architectures/systems does Debian GNU/Linux run?</a></li>
+  <li><a href="ch-compat.en.html#s-otherdistribs">3.2 How compatible is Debian with other distributions of Linux?</a></li>
+  <li><a href="ch-compat.en.html#s-otherunices">3.3 How source code compatible is Debian with other Unix systems?</a></li>
+  <li><a href="ch-compat.en.html#s-otherpackages">3.4 Can I use Debian packages (&quot;.deb&quot; files) on my Red Hat/Slackware/... Linux system? Can I use Red Hat packages (&quot;.rpm&quot; files) on my Debian GNU/Linux system?</a></li>
+  <li><a href="ch-compat.en.html#s-libc5">3.5 Is Debian able to run my old libc5 programs?</a></li>
+  <li><a href="ch-compat.en.html#s-libc5-compile">3.6 Can Debian be used to compile libc5 programs?</a></li>
+  <li><a href="ch-compat.en.html#s-non-debian-programs">3.7 How should I install a non-Debian program?</a></li>
+  <li><a href="ch-compat.en.html#s-termcap">3.8 Why can't I compile programs that require libtermcap?</a></li>
+  <li><a href="ch-compat.en.html#s-accelx">3.9 Why can't I install AccelX?</a></li>
+  <li><a href="ch-compat.en.html#s-motifnls">3.10 Why do my old XFree 2.1 Motif applications crash?</a>
+  </ul></li>
+<li><a href="ch-software.en.html">4 Software available in the Debian system</a>
+  <ul>
+  <li><a href="ch-software.en.html#s-apps">4.1 What types of applications and development software are available for Debian GNU/Linux?</a></li>
+  <li><a href="ch-software.en.html#s-softwareauthors">4.2 Who wrote all that software?</a></li>
+  <li><a href="ch-software.en.html#s-pkglist">4.3 How can I get a current list of programs that have been packaged for Debian?</a></li>
+  <li><a href="ch-software.en.html#s-missing">4.4 What is missing from Debian GNU/Linux?</a></li>
+  <li><a href="ch-software.en.html#s-no-devs">4.5 Why do I get &quot;ld: cannot find -lfoo&quot; messages when compiling programs? Why aren't there any libfoo.so files in Debian library packages?</a></li>
+  <li><a href="ch-software.en.html#s-java">4.6 (How) Does Debian support Java?</a></li>
+  <li><a href="ch-software.en.html#s-isitdebian">4.7 How can I check that I am using a Debian system, and what version is it?</a></li>
+  <li><a href="ch-software.en.html#s-nonenglish">4.8 How does Debian support non-English languages?</a></li>
+  <li><a href="ch-software.en.html#s-usexports">4.9 What about the US export regulation limitations?</a></li>
+  <li><a href="ch-software.en.html#s-pine">4.10 Where is pine?</a></li>
+  <li><a href="ch-software.en.html#s-qmail">4.11 Where is qmail/ezmlm/djbdns?</a>
+  </ul></li>
+<li><a href="ch-ftparchives.en.html">5 The Debian FTP archives</a>
+  <ul>
+  <li><a href="ch-ftparchives.en.html#s-dirtree">5.1 What are all those directories at the Debian FTP archives?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-dists">5.2 How many Debian distributions are there in the <samp>dists</samp> directory?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-codenames">5.3 What are all those names like slink, potato, etc.?</a>
+    <ul>
+    <li><a href="ch-ftparchives.en.html#s-oldcodenames">5.3.1 Which other codenames have been used in the past?</a></li>
+    <li><a href="ch-ftparchives.en.html#s-sourceforcodenames">5.3.2 Where do these codenames come from?</a>
+    </ul></li>
+  <li><a href="ch-ftparchives.en.html#s-sid">5.4 What about &quot;sid&quot;?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-stable">5.5 What does the stable directory contain?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-testing">5.6 What does the testing directory contain?</a>
+    <ul>
+    <li><a href="ch-ftparchives.en.html#s-frozen">5.6.1 What about &quot;testing&quot;? How is it `frozen'?</a>
+    </ul></li>
+  <li><a href="ch-ftparchives.en.html#s-unstable">5.7 What does the unstable directory contain?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-archsections">5.8 What are all those directories inside <samp>dists/stable/main</samp>?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-source">5.9 Where is the source code?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-pools">5.10 What's in the <samp>pool</samp> directory?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-incoming">5.11 What is &quot;incoming&quot;?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-ownrepository">5.12 How do I set up my own apt-able repository?</a>
+  </ul></li>
+<li><a href="ch-pkg_basics.en.html">6 Basics of the Debian package management system</a>
+  <ul>
+  <li><a href="ch-pkg_basics.en.html#s-package">6.1 What is a Debian package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-deb-format">6.2 What is the format of a Debian binary package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-pkgname">6.3 Why are Debian package file names so long?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-controlfile">6.4 What is a Debian control file?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-conffile">6.5 What is a Debian conffile?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-maintscripts">6.6 What is a Debian preinst, postinst, prerm, and postrm script?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-priority">6.7 What is an <em>Essential</em> <em>Required</em>, <em>Important</em>, <em>Standard</em>, <em>Optional</em>, or <em>Extra</em> package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-virtual">6.8 What is a Virtual Package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-depends">6.9 What is meant by saying that a package <em>Depends</em>, <em>Recommends</em>, <em>Suggests</em>, <em>Conflicts</em>, <em>Replaces</em> or <em>Provides</em> another package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-pre-depends">6.10 What is meant by Pre-Depends?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-pkgstatus">6.11 What is meant by <em>unknown</em>, <em>install</em>, <em>remove</em> <em>purge</em> and <em>hold</em> in the package status?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-puttingonhold">6.12 How do I put a package on hold?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-sourcepkgs">6.13 How do I install a source package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-sourcebuild">6.14 How do I build binary packages from a source package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-creatingdebs">6.15 How do I create Debian packages myself?</a>
+  </ul></li>
+<li><a href="ch-pkgtools.en.html">7 The Debian package management tools</a>
+  <ul>
+  <li><a href="ch-pkgtools.en.html#s-pkgprogs">7.1 What programs does Debian provide for managing its packages?</a>
+    <ul>
+    <li><a href="ch-pkgtools.en.html#s-dpkg">7.1.1 dpkg</a></li>
+    <li><a href="ch-pkgtools.en.html#s-apt-get">7.1.2 APT</a></li>
+    <li><a href="ch-pkgtools.en.html#s-aptitude">7.1.3 aptitude</a></li>
+    <li><a href="ch-pkgtools.en.html#s-dselect">7.1.4 dselect</a></li>
+    <li><a href="ch-pkgtools.en.html#s-dpkg-extra">7.1.5 Other package management tools</a>
+    </ul></li>
+  <li><a href="ch-pkgtools.en.html#s-updaterunning">7.2 Debian claims to be able to update a running program; how is this accomplished?</a></li>
+  <li><a href="ch-pkgtools.en.html#s-whatpackages">7.3 How can I tell what packages are already installed on a Debian system?</a></li>
+  <li><a href="ch-pkgtools.en.html#s-filesearch">7.4 How can I find out what package produced a particular file?</a></li>
+  <li><a href="ch-pkgtools.en.html#s-datapackages">7.5 Why doesn't get `foo-data' removed when I uninstall `foo'? How do I make sure old unused library-packages get purged?</a>
+  </ul></li>
+<li><a href="ch-uptodate.en.html">8 Keeping your Debian system up-to-date</a>
+  <ul>
+  <li><a href="ch-uptodate.en.html#s-libc5to6upgrade">8.1 How can I upgrade my Debian 1.3.1 (or earlier) distribution, based on libc5, to 2.0 (or later), based on libc6?</a></li>
+  <li><a href="ch-uptodate.en.html#s-howtocurrent">8.2 How can I keep my Debian system current?</a>
+    <ul>
+    <li><a href="ch-uptodate.en.html#s-aptitude-upgrade">8.2.1 aptitude</a></li>
+    <li><a href="ch-uptodate.en.html#s-apt">8.2.2 apt-get, dselect and apt-cdrom</a></li>
+    <li><a href="ch-uptodate.en.html#s-dpkg-ftp">8.2.3 dpkg-ftp</a></li>
+    <li><a href="ch-uptodate.en.html#s-mirror">8.2.4 mirror</a></li>
+    <li><a href="ch-uptodate.en.html#s-dpkg-mountable">8.2.5 dpkg-mountable</a>
+    </ul></li>
+  <li><a href="ch-uptodate.en.html#s-upgradesingle">8.3 Must I go into single user mode in order to upgrade a package?</a></li>
+  <li><a href="ch-uptodate.en.html#s-savedebs">8.4 Do I have to keep all those .deb archive files on my disk?</a></li>
+  <li><a href="ch-uptodate.en.html#s-keepingalog">8.5 How can I keep a log of the packages I added to the system? I'd like to know when which package upgrades and removals have occured!</a>
+  </ul></li>
+<li><a href="ch-kernel.en.html">9 Debian and the kernel</a>
+  <ul>
+  <li><a href="ch-kernel.en.html#s-non-debian-kernel">9.1 Can I install and compile a kernel without some Debian-specific tweaking?</a></li>
+  <li><a href="ch-kernel.en.html#s-customkernel">9.2 What tools does Debian provide to build custom kernels?</a></li>
+  <li><a href="ch-kernel.en.html#s-custombootdisk">9.3 How can I make a custom boot floppy?</a></li>
+  <li><a href="ch-kernel.en.html#s-modules">9.4 What special provisions does Debian provide to deal with modules?</a></li>
+  <li><a href="ch-kernel.en.html#s-removeoldkernel">9.5 Can I safely de-install an old kernel package, and if so, how?</a>
+  </ul></li>
+<li><a href="ch-customizing.en.html">10 Customizing your installation of Debian GNU/Linux</a>
+  <ul>
+  <li><a href="ch-customizing.en.html#s-papersize">10.1 How can I ensure that all programs use the same paper size?</a></li>
+  <li><a href="ch-customizing.en.html#s-hardwareaccess">10.2 How can I provide access to hardware peripherals, without compromising security?</a></li>
+  <li><a href="ch-customizing.en.html#s-consolefont">10.3 How do I load a console font on startup the Debian way?</a></li>
+  <li><a href="ch-customizing.en.html#s-appdefaults">10.4 How can I configure an X11 program's application defaults?</a></li>
+  <li><a href="ch-customizing.en.html#s-booting">10.5 Every distribution seems to have a different boot-up method. Tell me about Debian's.</a></li>
+  <li><a href="ch-customizing.en.html#s-custombootscripts">10.6 It looks as if Debian does not use <samp>rc.local</samp> to customize the boot process; what facilities are provided?</a></li>
+  <li><a href="ch-customizing.en.html#s-interconffiles">10.7 How does the package management system deal with packages that contain configuration files for other packages?</a></li>
+  <li><a href="ch-customizing.en.html#s-divert">10.8 How do I override a file installed by a package, so that a different version can be used instead?</a></li>
+  <li><a href="ch-customizing.en.html#s-localpackages">10.9 How can I have my locally-built package included in the list of available packages that the package management system knows about?</a></li>
+  <li><a href="ch-customizing.en.html#s-diverse">10.10 Some users like mawk, others like gawk; some like vim, others like elvis; some like trn, others like tin; how does Debian support diversity?</a>
+  </ul></li>
+<li><a href="ch-support.en.html">11 Getting support for Debian GNU/Linux</a>
+  <ul>
+  <li><a href="ch-support.en.html#s-debiandocs">11.1 What other documentation exists on and for a Debian system?</a></li>
+  <li><a href="ch-support.en.html#s-onlineresources">11.2 Are there any on-line resources for discussing Debian?</a>
+    <ul>
+    <li><a href="ch-support.en.html#s11.2.1">11.2.1 Mailing lists</a></li>
+    <li><a href="ch-support.en.html#s11.2.2">11.2.2 Maintainers</a></li>
+    <li><a href="ch-support.en.html#s11.2.3">11.2.3 Usenet newsgroups</a>
+    </ul></li>
+  <li><a href="ch-support.en.html#s-searchtools">11.3 Is there a quick way to search for information on Debian GNU/Linux?</a></li>
+  <li><a href="ch-support.en.html#s-buglogs">11.4 Are there logs of known bugs?</a></li>
+  <li><a href="ch-support.en.html#s-bugreport">11.5 How do I report a bug in Debian?</a>
+  </ul></li>
+<li><a href="ch-contributing.en.html">12 Contributing to the Debian Project</a>
+  <ul>
+  <li><a href="ch-contributing.en.html#s-contrib">12.1 How can I become a Debian software developer?</a></li>
+  <li><a href="ch-contributing.en.html#s-contribresources">12.2 How can I contribute resources to the Debian project?</a></li>
+  <li><a href="ch-contributing.en.html#s-supportingorganizations">12.3 How can I contribute financially to the Debian project?</a>
+    <ul>
+    <li><a href="ch-contributing.en.html#s-SPI">12.3.1 Software in the Public Interest</a></li>
+    <li><a href="ch-contributing.en.html#s-FSF">12.3.2 Free Software Foundation</a>
+    </ul></li>
+  </ul></li>
+<li><a href="ch-redistrib.en.html">13 Redistributing Debian GNU/Linux in a commercial product</a>
+  <ul>
+  <li><a href="ch-redistrib.en.html#s-sellcds">13.1 Can I make and sell Debian CDs?</a></li>
+  <li><a href="ch-redistrib.en.html#s-packagednonfree">13.2 Can Debian be packaged with non-free software?</a></li>
+  <li><a href="ch-redistrib.en.html#s-childistro">13.3 I am making a special Linux distribution for a &quot;vertical market&quot;. Can I use Debian GNU/Linux for the guts of a Linux system and add my own applications on top of it?</a></li>
+  <li><a href="ch-redistrib.en.html#s-commercialdebs">13.4 Can I put my commercial program in a Debian &quot;package&quot; so that it installs effortlessly on any Debian system?</a>
+  </ul></li>
+<li><a href="ch-nexttime.en.html">14 Changes expected in the next major release of Debian</a>
+  <ul>
+  <li><a href="ch-nexttime.en.html#s-security">14.1 Increased security</a></li>
+  <li><a href="ch-nexttime.en.html#s-i18n">14.2 Extended support for non-English users</a></li>
+  <li><a href="ch-nexttime.en.html#s-morearches">14.3 More architectures</a></li>
+  <li><a href="ch-nexttime.en.html#s-morekernels">14.4 More kernels</a>
+  </ul></li>
+<li><a href="ch-faqinfo.en.html">15 General information about the FAQ</a>
+  <ul>
+  <li><a href="ch-faqinfo.en.html#s-authors">15.1 Authors</a></li>
+  <li><a href="ch-faqinfo.en.html#s-feedback">15.2 Feedback</a></li>
+  <li><a href="ch-faqinfo.en.html#s-latest">15.3 Availability</a></li>
+  <li><a href="ch-faqinfo.en.html#s-docformat">15.4 Document format</a></li>
+  </ul></li>
+</ul>
+
+<hr>
+
+<p>
+[ <a href="ch-faqinfo.en.html">previous</a> ]
+[ <a href="#contents">Contents</a> ]
+[ <a href="ch-basic_defs.en.html">1</a> ]
+[ <a href="ch-getting.en.html">2</a> ]
+[ <a href="ch-compat.en.html">3</a> ]
+[ <a href="ch-software.en.html">4</a> ]
+[ <a href="ch-ftparchives.en.html">5</a> ]
+[ <a href="ch-pkg_basics.en.html">6</a> ]
+[ <a href="ch-pkgtools.en.html">7</a> ]
+[ <a href="ch-uptodate.en.html">8</a> ]
+[ <a href="ch-kernel.en.html">9</a> ]
+[ <a href="ch-customizing.en.html">10</a> ]
+[ <a href="ch-support.en.html">11</a> ]
+[ <a href="ch-contributing.en.html">12</a> ]
+[ <a href="ch-redistrib.en.html">13</a> ]
+[ <a href="ch-nexttime.en.html">14</a> ]
+[ <a href="ch-faqinfo.en.html">15</a> ]
+[ <a href="ch-basic_defs.en.html">next</a> ]
+</p>
+
+<hr>
+
+<p>
+The Debian GNU/Linux FAQ
+</p>
+
+<address>
+version 3.1.5, 17 January 2007<br>
+<br>
+Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
+<br>
+</address>
+<hr>
+
+</body>
+
+</html>
+
diff --git a/includes/etch/install/doc/FAQ/html/index.html b/includes/etch/install/doc/FAQ/html/index.html
new file mode 100644
index 0000000..7adba8c
--- /dev/null
+++ b/includes/etch/install/doc/FAQ/html/index.html
@@ -0,0 +1,311 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+
+<html>
+
+<head>
+
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+
+<title>The Debian GNU/Linux FAQ</title>
+
+</head>
+
+<body>
+
+<p><a name="index"></a></p>
+<hr>
+
+<p>
+[ <a href="ch-faqinfo.en.html">previous</a> ]
+[ <a href="#contents">Contents</a> ]
+[ <a href="ch-basic_defs.en.html">1</a> ]
+[ <a href="ch-getting.en.html">2</a> ]
+[ <a href="ch-compat.en.html">3</a> ]
+[ <a href="ch-software.en.html">4</a> ]
+[ <a href="ch-ftparchives.en.html">5</a> ]
+[ <a href="ch-pkg_basics.en.html">6</a> ]
+[ <a href="ch-pkgtools.en.html">7</a> ]
+[ <a href="ch-uptodate.en.html">8</a> ]
+[ <a href="ch-kernel.en.html">9</a> ]
+[ <a href="ch-customizing.en.html">10</a> ]
+[ <a href="ch-support.en.html">11</a> ]
+[ <a href="ch-contributing.en.html">12</a> ]
+[ <a href="ch-redistrib.en.html">13</a> ]
+[ <a href="ch-nexttime.en.html">14</a> ]
+[ <a href="ch-faqinfo.en.html">15</a> ]
+[ <a href="ch-basic_defs.en.html">next</a> ]
+</p>
+
+<hr>
+
+<h1>
+The Debian GNU/Linux FAQ
+<br></h1>
+
+<hr>
+
+<h2><a name="abstract"></a>Abstract</h2>
+
+<p>
+This document answers questions frequently asked about Debian GNU/Linux.
+</p>
+
+<hr>
+
+<h2><a name="copyright"></a>Copyright Notice</h2>
+
+<p>
+Copyright &copy; 1996-2005 by Software in the Public Interest
+</p>
+
+<p>
+Permission is granted to make and distribute verbatim copies of this document
+provided the copyright notice and this permission notice are preserved on all
+copies.
+</p>
+
+<p>
+Permission is granted to copy and distribute modified versions of this document
+under the conditions for verbatim copying, provided that the entire resulting
+derived work is distributed under the terms of a permission notice identical to
+this one.
+</p>
+
+<p>
+Permission is granted to copy and distribute translations of this document into
+another language, under the above conditions for modified versions, except that
+this permission notice may be included in translations approved by the Free
+Software Foundation instead of in the original English.
+</p>
+
+<hr>
+
+<h2><a name="contents"></a>Contents</h2>
+
+<ul>
+<li><a href="ch-basic_defs.en.html">1 Definitions and overview</a>
+  <ul>
+  <li><a href="ch-basic_defs.en.html#s-whatisfaq">1.1 What is this FAQ?</a></li>
+  <li><a href="ch-basic_defs.en.html#s-whatisdebian">1.2 What is Debian GNU/Linux?</a></li>
+  <li><a href="ch-basic_defs.en.html#s-linux">1.3 OK, now I know what Debian is... what is Linux?!</a></li>
+  <li><a href="ch-basic_defs.en.html#s-non-linux">1.4 Does Debian just do GNU/Linux?</a></li>
+  <li><a href="ch-basic_defs.en.html#s-difference">1.5 What is the difference between Debian GNU/Linux and other Linux distributions? Why should I choose Debian over some other distribution?</a></li>
+  <li><a href="ch-basic_defs.en.html#s-gnu">1.6 How does the Debian project fit in or compare with the Free Software Foundation's GNU project?</a></li>
+  <li><a href="ch-basic_defs.en.html#s-pronunciation">1.7 How does one pronounce Debian and what does this word mean?</a>
+  </ul></li>
+<li><a href="ch-getting.en.html">2 Getting and installing Debian GNU/Linux</a>
+  <ul>
+  <li><a href="ch-getting.en.html#s-version">2.1 What is the latest version of Debian?</a></li>
+  <li><a href="ch-getting.en.html#s-updatestable">2.2 Are there package upgrades in `stable'?</a></li>
+  <li><a href="ch-getting.en.html#s-boot-floppies">2.3 Where/how can I get the Debian installation disks?</a></li>
+  <li><a href="ch-getting.en.html#s-cdrom">2.4 How do I install the Debian from CD-ROMs?</a></li>
+  <li><a href="ch-getting.en.html#s-cdimage-symlinks">2.5 Why does the official stable released CD-ROM contain symlinks for `frozen' and `unstable'? I thought this CD contains just `stable'!</a></li>
+  <li><a href="ch-getting.en.html#s-cdimages">2.6 I have my own CD-writer, are there CD images available somewhere?</a></li>
+  <li><a href="ch-getting.en.html#s-floppy">2.7 Can I install it from a pile of floppy disks?</a></li>
+  <li><a href="ch-getting.en.html#s-remoteinstall">2.8 Can I get and install Debian directly from a remote Internet site?</a>
+  </ul></li>
+<li><a href="ch-compat.en.html">3 Compatibility issues</a>
+  <ul>
+  <li><a href="ch-compat.en.html#s-arches">3.1 On what hardware architectures/systems does Debian GNU/Linux run?</a></li>
+  <li><a href="ch-compat.en.html#s-otherdistribs">3.2 How compatible is Debian with other distributions of Linux?</a></li>
+  <li><a href="ch-compat.en.html#s-otherunices">3.3 How source code compatible is Debian with other Unix systems?</a></li>
+  <li><a href="ch-compat.en.html#s-otherpackages">3.4 Can I use Debian packages (&quot;.deb&quot; files) on my Red Hat/Slackware/... Linux system? Can I use Red Hat packages (&quot;.rpm&quot; files) on my Debian GNU/Linux system?</a></li>
+  <li><a href="ch-compat.en.html#s-libc5">3.5 Is Debian able to run my old libc5 programs?</a></li>
+  <li><a href="ch-compat.en.html#s-libc5-compile">3.6 Can Debian be used to compile libc5 programs?</a></li>
+  <li><a href="ch-compat.en.html#s-non-debian-programs">3.7 How should I install a non-Debian program?</a></li>
+  <li><a href="ch-compat.en.html#s-termcap">3.8 Why can't I compile programs that require libtermcap?</a></li>
+  <li><a href="ch-compat.en.html#s-accelx">3.9 Why can't I install AccelX?</a></li>
+  <li><a href="ch-compat.en.html#s-motifnls">3.10 Why do my old XFree 2.1 Motif applications crash?</a>
+  </ul></li>
+<li><a href="ch-software.en.html">4 Software available in the Debian system</a>
+  <ul>
+  <li><a href="ch-software.en.html#s-apps">4.1 What types of applications and development software are available for Debian GNU/Linux?</a></li>
+  <li><a href="ch-software.en.html#s-softwareauthors">4.2 Who wrote all that software?</a></li>
+  <li><a href="ch-software.en.html#s-pkglist">4.3 How can I get a current list of programs that have been packaged for Debian?</a></li>
+  <li><a href="ch-software.en.html#s-missing">4.4 What is missing from Debian GNU/Linux?</a></li>
+  <li><a href="ch-software.en.html#s-no-devs">4.5 Why do I get &quot;ld: cannot find -lfoo&quot; messages when compiling programs? Why aren't there any libfoo.so files in Debian library packages?</a></li>
+  <li><a href="ch-software.en.html#s-java">4.6 (How) Does Debian support Java?</a></li>
+  <li><a href="ch-software.en.html#s-isitdebian">4.7 How can I check that I am using a Debian system, and what version is it?</a></li>
+  <li><a href="ch-software.en.html#s-nonenglish">4.8 How does Debian support non-English languages?</a></li>
+  <li><a href="ch-software.en.html#s-usexports">4.9 What about the US export regulation limitations?</a></li>
+  <li><a href="ch-software.en.html#s-pine">4.10 Where is pine?</a></li>
+  <li><a href="ch-software.en.html#s-qmail">4.11 Where is qmail/ezmlm/djbdns?</a>
+  </ul></li>
+<li><a href="ch-ftparchives.en.html">5 The Debian FTP archives</a>
+  <ul>
+  <li><a href="ch-ftparchives.en.html#s-dirtree">5.1 What are all those directories at the Debian FTP archives?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-dists">5.2 How many Debian distributions are there in the <samp>dists</samp> directory?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-codenames">5.3 What are all those names like slink, potato, etc.?</a>
+    <ul>
+    <li><a href="ch-ftparchives.en.html#s-oldcodenames">5.3.1 Which other codenames have been used in the past?</a></li>
+    <li><a href="ch-ftparchives.en.html#s-sourceforcodenames">5.3.2 Where do these codenames come from?</a>
+    </ul></li>
+  <li><a href="ch-ftparchives.en.html#s-sid">5.4 What about &quot;sid&quot;?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-stable">5.5 What does the stable directory contain?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-testing">5.6 What does the testing directory contain?</a>
+    <ul>
+    <li><a href="ch-ftparchives.en.html#s-frozen">5.6.1 What about &quot;testing&quot;? How is it `frozen'?</a>
+    </ul></li>
+  <li><a href="ch-ftparchives.en.html#s-unstable">5.7 What does the unstable directory contain?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-archsections">5.8 What are all those directories inside <samp>dists/stable/main</samp>?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-source">5.9 Where is the source code?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-pools">5.10 What's in the <samp>pool</samp> directory?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-incoming">5.11 What is &quot;incoming&quot;?</a></li>
+  <li><a href="ch-ftparchives.en.html#s-ownrepository">5.12 How do I set up my own apt-able repository?</a>
+  </ul></li>
+<li><a href="ch-pkg_basics.en.html">6 Basics of the Debian package management system</a>
+  <ul>
+  <li><a href="ch-pkg_basics.en.html#s-package">6.1 What is a Debian package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-deb-format">6.2 What is the format of a Debian binary package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-pkgname">6.3 Why are Debian package file names so long?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-controlfile">6.4 What is a Debian control file?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-conffile">6.5 What is a Debian conffile?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-maintscripts">6.6 What is a Debian preinst, postinst, prerm, and postrm script?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-priority">6.7 What is an <em>Essential</em> <em>Required</em>, <em>Important</em>, <em>Standard</em>, <em>Optional</em>, or <em>Extra</em> package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-virtual">6.8 What is a Virtual Package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-depends">6.9 What is meant by saying that a package <em>Depends</em>, <em>Recommends</em>, <em>Suggests</em>, <em>Conflicts</em>, <em>Replaces</em> or <em>Provides</em> another package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-pre-depends">6.10 What is meant by Pre-Depends?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-pkgstatus">6.11 What is meant by <em>unknown</em>, <em>install</em>, <em>remove</em> <em>purge</em> and <em>hold</em> in the package status?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-puttingonhold">6.12 How do I put a package on hold?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-sourcepkgs">6.13 How do I install a source package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-sourcebuild">6.14 How do I build binary packages from a source package?</a></li>
+  <li><a href="ch-pkg_basics.en.html#s-creatingdebs">6.15 How do I create Debian packages myself?</a>
+  </ul></li>
+<li><a href="ch-pkgtools.en.html">7 The Debian package management tools</a>
+  <ul>
+  <li><a href="ch-pkgtools.en.html#s-pkgprogs">7.1 What programs does Debian provide for managing its packages?</a>
+    <ul>
+    <li><a href="ch-pkgtools.en.html#s-dpkg">7.1.1 dpkg</a></li>
+    <li><a href="ch-pkgtools.en.html#s-apt-get">7.1.2 APT</a></li>
+    <li><a href="ch-pkgtools.en.html#s-aptitude">7.1.3 aptitude</a></li>
+    <li><a href="ch-pkgtools.en.html#s-dselect">7.1.4 dselect</a></li>
+    <li><a href="ch-pkgtools.en.html#s-dpkg-extra">7.1.5 Other package management tools</a>
+    </ul></li>
+  <li><a href="ch-pkgtools.en.html#s-updaterunning">7.2 Debian claims to be able to update a running program; how is this accomplished?</a></li>
+  <li><a href="ch-pkgtools.en.html#s-whatpackages">7.3 How can I tell what packages are already installed on a Debian system?</a></li>
+  <li><a href="ch-pkgtools.en.html#s-filesearch">7.4 How can I find out what package produced a particular file?</a></li>
+  <li><a href="ch-pkgtools.en.html#s-datapackages">7.5 Why doesn't get `foo-data' removed when I uninstall `foo'? How do I make sure old unused library-packages get purged?</a>
+  </ul></li>
+<li><a href="ch-uptodate.en.html">8 Keeping your Debian system up-to-date</a>
+  <ul>
+  <li><a href="ch-uptodate.en.html#s-libc5to6upgrade">8.1 How can I upgrade my Debian 1.3.1 (or earlier) distribution, based on libc5, to 2.0 (or later), based on libc6?</a></li>
+  <li><a href="ch-uptodate.en.html#s-howtocurrent">8.2 How can I keep my Debian system current?</a>
+    <ul>
+    <li><a href="ch-uptodate.en.html#s-aptitude-upgrade">8.2.1 aptitude</a></li>
+    <li><a href="ch-uptodate.en.html#s-apt">8.2.2 apt-get, dselect and apt-cdrom</a></li>
+    <li><a href="ch-uptodate.en.html#s-dpkg-ftp">8.2.3 dpkg-ftp</a></li>
+    <li><a href="ch-uptodate.en.html#s-mirror">8.2.4 mirror</a></li>
+    <li><a href="ch-uptodate.en.html#s-dpkg-mountable">8.2.5 dpkg-mountable</a>
+    </ul></li>
+  <li><a href="ch-uptodate.en.html#s-upgradesingle">8.3 Must I go into single user mode in order to upgrade a package?</a></li>
+  <li><a href="ch-uptodate.en.html#s-savedebs">8.4 Do I have to keep all those .deb archive files on my disk?</a></li>
+  <li><a href="ch-uptodate.en.html#s-keepingalog">8.5 How can I keep a log of the packages I added to the system? I'd like to know when which package upgrades and removals have occured!</a>
+  </ul></li>
+<li><a href="ch-kernel.en.html">9 Debian and the kernel</a>
+  <ul>
+  <li><a href="ch-kernel.en.html#s-non-debian-kernel">9.1 Can I install and compile a kernel without some Debian-specific tweaking?</a></li>
+  <li><a href="ch-kernel.en.html#s-customkernel">9.2 What tools does Debian provide to build custom kernels?</a></li>
+  <li><a href="ch-kernel.en.html#s-custombootdisk">9.3 How can I make a custom boot floppy?</a></li>
+  <li><a href="ch-kernel.en.html#s-modules">9.4 What special provisions does Debian provide to deal with modules?</a></li>
+  <li><a href="ch-kernel.en.html#s-removeoldkernel">9.5 Can I safely de-install an old kernel package, and if so, how?</a>
+  </ul></li>
+<li><a href="ch-customizing.en.html">10 Customizing your installation of Debian GNU/Linux</a>
+  <ul>
+  <li><a href="ch-customizing.en.html#s-papersize">10.1 How can I ensure that all programs use the same paper size?</a></li>
+  <li><a href="ch-customizing.en.html#s-hardwareaccess">10.2 How can I provide access to hardware peripherals, without compromising security?</a></li>
+  <li><a href="ch-customizing.en.html#s-consolefont">10.3 How do I load a console font on startup the Debian way?</a></li>
+  <li><a href="ch-customizing.en.html#s-appdefaults">10.4 How can I configure an X11 program's application defaults?</a></li>
+  <li><a href="ch-customizing.en.html#s-booting">10.5 Every distribution seems to have a different boot-up method. Tell me about Debian's.</a></li>
+  <li><a href="ch-customizing.en.html#s-custombootscripts">10.6 It looks as if Debian does not use <samp>rc.local</samp> to customize the boot process; what facilities are provided?</a></li>
+  <li><a href="ch-customizing.en.html#s-interconffiles">10.7 How does the package management system deal with packages that contain configuration files for other packages?</a></li>
+  <li><a href="ch-customizing.en.html#s-divert">10.8 How do I override a file installed by a package, so that a different version can be used instead?</a></li>
+  <li><a href="ch-customizing.en.html#s-localpackages">10.9 How can I have my locally-built package included in the list of available packages that the package management system knows about?</a></li>
+  <li><a href="ch-customizing.en.html#s-diverse">10.10 Some users like mawk, others like gawk; some like vim, others like elvis; some like trn, others like tin; how does Debian support diversity?</a>
+  </ul></li>
+<li><a href="ch-support.en.html">11 Getting support for Debian GNU/Linux</a>
+  <ul>
+  <li><a href="ch-support.en.html#s-debiandocs">11.1 What other documentation exists on and for a Debian system?</a></li>
+  <li><a href="ch-support.en.html#s-onlineresources">11.2 Are there any on-line resources for discussing Debian?</a>
+    <ul>
+    <li><a href="ch-support.en.html#s11.2.1">11.2.1 Mailing lists</a></li>
+    <li><a href="ch-support.en.html#s11.2.2">11.2.2 Maintainers</a></li>
+    <li><a href="ch-support.en.html#s11.2.3">11.2.3 Usenet newsgroups</a>
+    </ul></li>
+  <li><a href="ch-support.en.html#s-searchtools">11.3 Is there a quick way to search for information on Debian GNU/Linux?</a></li>
+  <li><a href="ch-support.en.html#s-buglogs">11.4 Are there logs of known bugs?</a></li>
+  <li><a href="ch-support.en.html#s-bugreport">11.5 How do I report a bug in Debian?</a>
+  </ul></li>
+<li><a href="ch-contributing.en.html">12 Contributing to the Debian Project</a>
+  <ul>
+  <li><a href="ch-contributing.en.html#s-contrib">12.1 How can I become a Debian software developer?</a></li>
+  <li><a href="ch-contributing.en.html#s-contribresources">12.2 How can I contribute resources to the Debian project?</a></li>
+  <li><a href="ch-contributing.en.html#s-supportingorganizations">12.3 How can I contribute financially to the Debian project?</a>
+    <ul>
+    <li><a href="ch-contributing.en.html#s-SPI">12.3.1 Software in the Public Interest</a></li>
+    <li><a href="ch-contributing.en.html#s-FSF">12.3.2 Free Software Foundation</a>
+    </ul></li>
+  </ul></li>
+<li><a href="ch-redistrib.en.html">13 Redistributing Debian GNU/Linux in a commercial product</a>
+  <ul>
+  <li><a href="ch-redistrib.en.html#s-sellcds">13.1 Can I make and sell Debian CDs?</a></li>
+  <li><a href="ch-redistrib.en.html#s-packagednonfree">13.2 Can Debian be packaged with non-free software?</a></li>
+  <li><a href="ch-redistrib.en.html#s-childistro">13.3 I am making a special Linux distribution for a &quot;vertical market&quot;. Can I use Debian GNU/Linux for the guts of a Linux system and add my own applications on top of it?</a></li>
+  <li><a href="ch-redistrib.en.html#s-commercialdebs">13.4 Can I put my commercial program in a Debian &quot;package&quot; so that it installs effortlessly on any Debian system?</a>
+  </ul></li>
+<li><a href="ch-nexttime.en.html">14 Changes expected in the next major release of Debian</a>
+  <ul>
+  <li><a href="ch-nexttime.en.html#s-security">14.1 Increased security</a></li>
+  <li><a href="ch-nexttime.en.html#s-i18n">14.2 Extended support for non-English users</a></li>
+  <li><a href="ch-nexttime.en.html#s-morearches">14.3 More architectures</a></li>
+  <li><a href="ch-nexttime.en.html#s-morekernels">14.4 More kernels</a>
+  </ul></li>
+<li><a href="ch-faqinfo.en.html">15 General information about the FAQ</a>
+  <ul>
+  <li><a href="ch-faqinfo.en.html#s-authors">15.1 Authors</a></li>
+  <li><a href="ch-faqinfo.en.html#s-feedback">15.2 Feedback</a></li>
+  <li><a href="ch-faqinfo.en.html#s-latest">15.3 Availability</a></li>
+  <li><a href="ch-faqinfo.en.html#s-docformat">15.4 Document format</a></li>
+  </ul></li>
+</ul>
+
+<hr>
+
+<p>
+[ <a href="ch-faqinfo.en.html">previous</a> ]
+[ <a href="#contents">Contents</a> ]
+[ <a href="ch-basic_defs.en.html">1</a> ]
+[ <a href="ch-getting.en.html">2</a> ]
+[ <a href="ch-compat.en.html">3</a> ]
+[ <a href="ch-software.en.html">4</a> ]
+[ <a href="ch-ftparchives.en.html">5</a> ]
+[ <a href="ch-pkg_basics.en.html">6</a> ]
+[ <a href="ch-pkgtools.en.html">7</a> ]
+[ <a href="ch-uptodate.en.html">8</a> ]
+[ <a href="ch-kernel.en.html">9</a> ]
+[ <a href="ch-customizing.en.html">10</a> ]
+[ <a href="ch-support.en.html">11</a> ]
+[ <a href="ch-contributing.en.html">12</a> ]
+[ <a href="ch-redistrib.en.html">13</a> ]
+[ <a href="ch-nexttime.en.html">14</a> ]
+[ <a href="ch-faqinfo.en.html">15</a> ]
+[ <a href="ch-basic_defs.en.html">next</a> ]
+</p>
+
+<hr>
+
+<p>
+The Debian GNU/Linux FAQ
+</p>
+
+<address>
+version 3.1.5, 17 January 2007<br>
+<br>
+Authors are listed at <a href="ch-faqinfo.en.html#s-authors">Debian FAQ Authors</a><br>
+<br>
+</address>
+<hr>
+
+</body>
+
+</html>
+
diff --git a/includes/common/doc/bug-log-access.txt b/includes/etch/install/doc/bug-log-access.txt
index c8fa75f..c8fa75f 100644
--- a/includes/common/doc/bug-log-access.txt
+++ b/includes/etch/install/doc/bug-log-access.txt
diff --git a/includes/common/doc/bug-log-mailserver.txt b/includes/etch/install/doc/bug-log-mailserver.txt
index aa28efc..aa28efc 100644
--- a/includes/common/doc/bug-log-mailserver.txt
+++ b/includes/etch/install/doc/bug-log-mailserver.txt
diff --git a/includes/common/doc/bug-mailserver-refcard.txt b/includes/etch/install/doc/bug-mailserver-refcard.txt
index b3ce545..b3ce545 100644
--- a/includes/common/doc/bug-mailserver-refcard.txt
+++ b/includes/etch/install/doc/bug-mailserver-refcard.txt
diff --git a/includes/common/doc/bug-maint-info.txt b/includes/etch/install/doc/bug-maint-info.txt
index 1a450eb..de36df0 100644
--- a/includes/common/doc/bug-maint-info.txt
+++ b/includes/etch/install/doc/bug-maint-info.txt
@@ -30,8 +30,8 @@ Closing bug reports
    Problems in packages can only be considered fixed once a package that
    includes the bug fix enters the Debian archive.
 
-   Normally, the only people that are allowed to close a bug report are
-   the submitter of the bug and the maintainer(s) of the package against
+   Normally, the only people that should close a bug report are the
+   submitter of the bug and the maintainer(s) of the package against
    which the bug is filed. There are exceptions to this rule, for
    example, the bugs filed against unknown packages or certain generic
    pseudo-packages. When in doubt, don't close bugs, first ask for advice
diff --git a/includes/common/doc/bug-maint-mailcontrol.txt b/includes/etch/install/doc/bug-maint-mailcontrol.txt
index 1167b10..52f8474 100644
--- a/includes/common/doc/bug-maint-mailcontrol.txt
+++ b/includes/etch/install/doc/bug-maint-mailcontrol.txt
@@ -76,6 +76,12 @@ Commands available at the control mailserver
           If no version is given, then the list of fixed versions for the
           bug is cleared. This is identical to the behaviour of reopen.
 
+          This command will only cause a bug to be marked as not done if
+          no version is specified, or if the version being marked found
+          is equal to the version which was last marked fixed. (If you
+          are certain that you want the bug marked as not done, use
+          reopen in conjunction with found.)
+
           This command was introduced in preference to reopen because it
           was difficult to add a version to that command's syntax without
           suffering ambiguity.
@@ -89,6 +95,23 @@ Commands available at the control mailserver
           information about that version will be known. It is intended
           for fixing mistakes in the record of when a bug was found.
 
+   fixed bugnumber version
+          Indicate that bug #bugnumber was fixed in the given version of
+          the package to which it is assigned.
+
+          This does not cause the bug to be marked as closed, it merely
+          adds another version in which the bug was fixed. Use the
+          bugnumber-done address to close a bug and mark it fixed in a
+          particular version.
+
+   notfixed bugnumber version
+          Remove the record that bug #bugnumber has been fixed in the
+          given version.
+
+          This command is equivalent to found followed by notfound (the
+          found removes the fixed at a particular version, and notfound
+          removes the found.)
+
    submitter bugnumber originator-address | !
           Changes the originator of #bugnumber to originator-address.
 
@@ -242,12 +265,12 @@ Commands available at the control mailserver
           documentation for the bug system.
 
    block bugnumber by bug ...
-          Note that the fix for the first bug is blocked the the other
+          Note that the fix for the first bug is blocked by the other
           listed bugs.
 
    unblock bugnumber by bug ...
-          Note that the fix for the first bug is no longer blocked the
-          the other listed bugs.
+          Note that the fix for the first bug is no longer blocked by the
+          other listed bugs.
 
    close bugnumber [ fixed-version ] (deprecated)
           Close bug report #bugnumber.
@@ -286,9 +309,9 @@ Commands available at the control mailserver
 
    owner bugnumber address | !
           Sets address to be the "owner" of #bugnumber. The owner of a
-          bug claims responsibility for fixing it and will receive all
-          mail regarding it. This is useful to share out work in cases
-          where a package has a team of maintainers.
+          bug claims responsibility for fixing it. This is useful to
+          share out work in cases where a package has a team of
+          maintainers.
 
           If you wish to become the owner of the bug yourself, you can
           use the ! shorthand or specify your own email address.
@@ -306,12 +329,16 @@ Commands available at the control mailserver
 
    quit
    stop
-   thank...
-   --...
-          Tells the control server to stop processing the message; the
-          remainder of the message can include explanations, signatures
-          or anything else, none of it will be detected by the control
-          server.
+   thank
+   thanks
+   thankyou
+   thank you
+   --
+          On a line by itself, in any case, possibly followed by
+          whitespace, tells the control server to stop processing the
+          message; the remainder of the message can include explanations,
+          signatures or anything else, none of it will be detected by the
+          control server.
      _________________________________________________________________
 
     Debian BTS administrators <owner@bugs.debian.org>
diff --git a/includes/common/doc/bug-reporting.txt b/includes/etch/install/doc/bug-reporting.txt
index ca14c2a..8ea79c5 100644
--- a/includes/common/doc/bug-reporting.txt
+++ b/includes/etch/install/doc/bug-reporting.txt
@@ -2,13 +2,13 @@ How to report a bug in Debian
 
 Important things to note before sending
 
-   Please don't report multiple unrelated bugs - especially ones in
-   different packages - in a single bug report. It makes our lives much
+   Please don't report multiple unrelated bugs -- especially ones in
+   different packages -- in a single bug report. It makes our lives much
    easier if you send separate reports.
 
    You should check if your bug report has already been filed by someone
    else before submitting it. Lists of currently outstanding bugs are
-   available on the World Wide Web and elsewhere - see other documents
+   available on the World Wide Web and elsewhere -- see other documents
    for details. You can submit your comments to an existing bug report
    #<number> by sending e-mail to <number>@bugs.debian.org
 
@@ -35,9 +35,9 @@ Sending the bug report using an automatic bug report tool
 
 Sending the bug report via e-mail
 
-   Send email to submit@bugs.debian.org, as described below.
+   Send e-mail to submit@bugs.debian.org, as described below.
 
-   Of course, like any email, you should include a clear, descriptive
+   Of course, like any e-mail, you should include a clear, descriptive
    Subject line in your main mail header. The subject you give will be
    used as the initial bug title in the tracking system, so please try to
    make it informative!
@@ -87,11 +87,11 @@ Version: <something>
        hardware in your system, as problems are often caused by IRQ and
        I/O address conflicts.
 
-   Include any detail that seems relevant - you are in very little danger
-   of making your report too long by including too much information. If
-   they are small please include in your report any files you were using
-   to reproduce the problem (uuencoding them if they may contain odd
-   characters etc.).
+   Include any detail that seems relevant -- you are in very little
+   danger of making your report too long by including too much
+   information. If they are small please include in your report any files
+   you were using to reproduce the problem (uuencoding them if they may
+   contain odd characters etc.).
 
    For more advice on how to help the developers solve your problem,
    please read How to Report Bugs Effectively.
@@ -148,7 +148,7 @@ Sending copies of bug reports to other addresses
    bug number added by that mechanism will just be replaced by a new one;
    use an ordinary CC header instead.
 
-   This feature can often be combined usefully with mailing quiet - see
+   This feature can often be combined usefully with mailing quiet -- see
    below.
 
 Severity levels
@@ -178,6 +178,13 @@ Tags: <tags>
    Replace <tags> with one or more of the available tags, as described in
    the developers' documentation. Separate multiple tags with commas,
    spaces, or both.
+User: <username>
+Usertags: <usertags>
+
+   Replace <usertags> with one or more usertags. Separate multiple tags
+   with commas, spaces, or both. If you specify a <username>, that user's
+   tags will be set. Otherwise, the e-mail address of the sender will be
+   used as the username.
 
 Other pseudo headers (primarily of interest to package maintainers)
 
diff --git a/includes/common/doc/constitution.txt b/includes/etch/install/doc/constitution.txt
index 191f73b..70eca90 100644
--- a/includes/common/doc/constitution.txt
+++ b/includes/etch/install/doc/constitution.txt
@@ -1,38 +1,42 @@
-                              Debian Constitution
-                                       
-                  Constitution for the Debian Project (v1.0)
-                                       
+
+     Historical version of the Constitution for the Debian Project (v1.2)
+
+   Version 1.2 ratified on October 29^th, 2003. Supersedes Version 1.1
+   ratified on June 21^st, 2003, which itself supersedes Version 1.0
+   ratified on December 2^nd, 1998. Superseded by version 1.3, ratified
+   on September 24^th, 2006.
+
 1. Introduction
 
    The Debian Project is an association of individuals who have made
    common cause to create a free operating system.
-   
+
    This document describes the organisational structure for formal
-   decisionmaking in the Project. It does not describe the goals of the
+   decision-making in the Project. It does not describe the goals of the
    Project or how it achieves them, or contain any policies except those
-   directly related to the decisionmaking process.
-   
-2. Decisionmaking bodies and individuals
+   directly related to the decision-making process.
+
+2. Decision-making bodies and individuals
 
    Each decision in the Project is made by one or more of the following:
     1. The Developers, by way of General Resolution or an election;
     2. The Project Leader;
     3. The Technical Committee and/or its Chairman;
     4. The individual Developer working on a particular task;
-    5. Delegates appointed by the Project Leader for specific tasks.
-    6. The Project Secretary;
-       
+    5. Delegates appointed by the Project Leader for specific tasks;
+    6. The Project Secretary.
+
    Most of the remainder of this document will outline the powers of
    these bodies, their composition and appointment, and the procedure for
-   their decisionmaking. The powers of a person or body may be subject to
-   review and/or limitation by others; in this case the reviewing body or
-   person's entry will state this. In the list above, a person or body is
-   usually listed before any people or bodies whose decisions they can
+   their decision-making. The powers of a person or body may be subject
+   to review and/or limitation by others; in this case the reviewing body
+   or person's entry will state this. In the list above, a person or body
+   is usually listed before any people or bodies whose decisions they can
    overrule or who they (help) appoint - but not everyone listed earlier
    can overrule everyone listed later.
-   
+
   2.1. General rules
-  
+
     1. Nothing in this constitution imposes an obligation on anyone to do
        work for the Project. A person who does not want to do a task
        which has been delegated or assigned to them does not need to do
@@ -44,20 +48,20 @@
        their own Delegate.
     3. A person may leave the Project or resign from a particular post
        they hold, at any time, by stating so publicly.
-       
+
 3. Individual Developers
 
   3.1. Powers
-  
+
    An individual Developer may
     1. make any technical or nontechnical decision with regard to their
        own work;
     2. propose or sponsor draft General Resolutions;
     3. propose themselves as a Project Leader candidate in elections;
     4. vote on General Resolutions and in Leadership elections.
-       
+
   3.2. Composition and appointment
-  
+
     1. Developers are volunteers who agree to further the aims of the
        Project insofar as they participate in it, and who maintain
        package(s) for the Project or do other work which the Project
@@ -65,35 +69,43 @@
     2. The Project Leader's Delegate(s) may choose not to admit new
        Developers, or expel existing Developers. If the Developers feel
        that the Delegates are abusing their authority they can of course
-       override the decision by way of General Resolution - see s.4.1(3),
-       s.4.2.
-       
+       override the decision by way of General Resolution - see §4.1(3),
+       §4.2.
+
   3.3. Procedure
-  
+
    Developers may make these decisions as they see fit.
-   
+
 4. The Developers by way of General Resolution or election
 
   4.1. Powers
-  
+
    Together, the Developers may:
     1. Appoint or recall the Project Leader.
     2. Amend this constitution, provided they agree with a 3:1 majority.
     3. Override any decision by the Project Leader or a Delegate.
     4. Override any decision by the Technical Committee, provided they
        agree with a 2:1 majority.
-    5. Issue nontechnical policy documents and statements.
+    5. Issue, supersede and withdraw nontechnical policy documents and
+       statements.
        These include documents describing the goals of the project, its
        relationship with other free software entities, and nontechnical
        policies such as the free software licence terms that Debian
        software must meet.
        They may also include position statements about issues of the day.
+         1. A Foundation Document is a document or statement regarded as
+            critical to the Project's mission and purposes.
+         2. The Foundation Documents are the works entitled "Debian
+            Social Contract" and "Debian Free Software Guidelines".
+         3. A Foundation Document requires a 3:1 majority for its
+            supersession. New Foundation Documents are issued and
+            existing ones withdrawn by amending the list of Foundation
+            Documents in this constitution.
     6. Together with the Project Leader and SPI, make decisions about
-       property held in trust for purposes related to Debian. (See
-       s.9.1.)
-       
+       property held in trust for purposes related to Debian. (See §9.1.)
+
   4.2. Procedure
-  
+
     1. The Developers follow the Standard Resolution Procedure, below. A
        resolution or amendment is introduced if proposed by any Developer
        and sponsored by at least K other Developers, or if proposed by
@@ -101,7 +113,7 @@
     2. Delaying a decision by the Project Leader or their Delegate:
          1. If the Project Leader or their Delegate, or the Technical
             Committee, has made a decision, then Developers can override
-            them by passing a resolution to do so; see s4.1(3).
+            them by passing a resolution to do so; see §4.1(3).
          2. If such a resolution is sponsored by at least 2K Developers,
             or if it is proposed by the Technical Committee, the
             resolution puts the decision immediately on hold (provided
@@ -114,17 +126,16 @@
          4. If the decision is put on hold, an immediate vote is held to
             determine whether the decision will stand until the full vote
             on the decision is made or whether the implementation of the
-            original decision will be be delayed until then. There is no
+            original decision will be delayed until then. There is no
             quorum for this immediate procedural vote.
          5. If the Project Leader (or the Delegate) withdraws the
             original decision, the vote becomes moot, and is no longer
             conducted.
-    3. Votes are taken by the Project Secretary. Votes and tallies
-       results are not be revealed during the voting period; after the
-       vote the Project Secretary lists all the votes cast. The voting
-       period is 2 weeks, but may be varied by up to 1 week by the
-       Project Leader, and may be ended by the Project Secretary when the
-       outcome of a vote is no longer in doubt.
+    3. Votes are taken by the Project Secretary. Votes, tallies, and
+       results are not revealed during the voting period; after the vote
+       the Project Secretary lists all the votes cast. The voting period
+       is 2 weeks, but may be varied by up to 1 week by the Project
+       Leader.
     4. The minimum discussion period is 2 weeks, but may be varied by up
        to 1 week by the Project Leader. The Project Leader has a casting
        vote. There is a quorum of 3Q.
@@ -138,11 +149,11 @@
     7. Q is half of the square root of the number of current Developers.
        K is Q or 5, whichever is the smaller. Q and K need not be
        integers and are not rounded.
-       
+
 5. Project Leader
 
   5.1. Powers
-  
+
    The Project Leader may:
     1. Appoint Delegates or delegate decisions to the Technical
        Committee.
@@ -165,7 +176,7 @@
     4. Make any decision for whom noone else has responsibility.
     5. Propose draft General Resolutions and amendments.
     6. Together with the Technical Committee, appoint new members to the
-       Committee. (See s.6.2.)
+       Committee. (See §6.2.)
     7. Use a casting vote when Developers vote.
        The Project Leader also has a normal vote in such ballots.
     8. Vary the discussion period for Developers' votes (as above).
@@ -176,10 +187,10 @@
        should not use the Leadership position to promote their own
        personal views.
    10. Together with SPI, make decisions affecting property held in trust
-       for purposes related to Debian. (See s.9.1.)
-       
+       for purposes related to Debian. (See §9.1.)
+
   5.2. Appointment
-  
+
     1. The Project Leader is elected by the Developers.
     2. The election begins nine weeks before the leadership post becomes
        vacant, or (if it is too late already) immediately.
@@ -197,26 +208,27 @@
        nominated themselves and have not yet withdrawn, plus None Of The
        Above. If None Of The Above wins the election then the election
        procedure is repeated, many times if necessary.
-    7. The decision will be made using Concorde Vote Counting. The quorum
-       is the same as for a General Resolution (s.4.2) and the default
-       option is None Of The Above.
+    7. The decision will be made using the method specified in section
+       §A.6 of the Standard Resolution Procedure. The quorum is the same
+       as for a General Resolution (§4.2) and the default option is "None
+       Of The Above".
     8. The Project Leader serves for one year from their election.
-       
+
   5.3. Procedure
-  
+
    The Project Leader should attempt to make decisions which are
    consistent with the consensus of the opinions of the Developers.
-   
+
    Where practical the Project Leader should informally solicit the views
    of the Developers.
-   
+
    The Project Leader should avoid overemphasizing their own point of
    view when making decisions in their capacity as Leader.
-   
+
 6. Technical committee
 
   6.1. Powers
-  
+
    The Technical Committee may:
     1. Decide on any matter of technical policy.
        This includes the contents of the technical policy manuals,
@@ -249,25 +261,25 @@
        informal statements about their views and about the likely views
        of the committee.
     6. Together with the Project Leader, appoint new members to itself or
-       remove existing members. (See s.6.2.)
+       remove existing members. (See §6.2.)
     7. Appoint the Chairman of the Technical Committee.
        The Chairman is elected by the Committee from its members. All
        members of the committee are automatically nominated; the
-       committee vote starting one week before the post will become
+       committee votes starting one week before the post will become
        vacant (or immediately, if it is already too late). The members
        may vote by public acclamation for any fellow committee member,
-       including themselves; there is no None Of The Above option. The
-       vote finishes when all the members have voted or when the outcome
-       is no longer in doubt. The result is determined according to
-       Concorde Vote Counting.
+       including themselves; there is no default option. The vote
+       finishes when all the members have voted, or when the voting
+       period has ended. The result is determined using the method
+       specified in section A.6 of the Standard Resolution Procedure.
     8. The Chairman can stand in for the Leader, together with the
        Secretary
-       As detailed in s.7.1(2), the Chairman of the Technical Committee
+       As detailed in §7.1(2), the Chairman of the Technical Committee
        and the Project Secretary may together stand in for the Leader if
        there is no Leader.
-       
+
   6.2. Composition
-  
+
     1. The Technical Committee consists of up to 8 Developers, and should
        usually have at least 4 members.
     2. When there are fewer than 8 members the Technical Committee may
@@ -281,9 +293,9 @@
        appointment.
     5. If the Technical Committee and the Project Leader agree they may
        remove or replace an existing member of the Technical Committee.
-       
+
   6.3. Procedure
-  
+
     1. The Technical Committee uses the Standard Resolution Procedure.
        A draft resolution or amendment may be proposed by any member of
        the Technical Committee. There is no minimum discussion period;
@@ -295,7 +307,7 @@
        votes whether to override a Developer who also happens to be a
        member of the Committee, that member may not vote (unless they are
        the Chairman, in which case they may use only their casting vote).
-    3. Public discussion and decisionmaking.
+    3. Public discussion and decision-making.
        Discussion, draft resolutions and amendments, and votes by members
        of the committee, are made public on the Technical Committee
        public discussion list. There is no separate secretary for the
@@ -321,11 +333,11 @@
        efforts to resolve it via consensus have been tried and failed,
        unless it has been asked to make a decision by the person or body
        who would normally be responsible for it.
-       
+
 7. The Project Secretary
 
   7.1. Powers
-  
+
    The Secretary:
     1. Takes votes amongst the Developers, and determines the number and
        identity of Developers, whenever this is required by the
@@ -338,69 +350,69 @@
     3. Adjudicates any disputes about interpretation of the constitution.
     4. May delegate part or all of their authority to someone else, or
        withdraw such a delegation at any time.
-       
+
   7.2. Appointment
-  
+
    The Project Secretary is appointed by the Project Leader and the
    current Project Secretary.
-   
+
    If the Project Leader and the current Project Secretary cannot agree
-   on a new appointment they must ask the board of SPI to appoint a
-   Secretary.
-   
+   on a new appointment they must ask the board of SPI (see §9.1.) to
+   appoint a Secretary.
+
    If there is no Project Secretary or the current Secretary is
    unavailable and has not delegated authority for a decision then the
    decision may be made or delegated by the Chairman of the Technical
    Committee, as Acting Secretary.
-   
+
    The Project Secretary's term of office is 1 year, at which point they
    or another Secretary must be (re)appointed.
-   
+
   7.3. Procedure
-  
+
    The Project Secretary should make decisions which are fair and
    reasonable, and preferably consistent with the consensus of the
    Developers.
-   
+
    When acting together to stand in for an absent Project Leader the
    Chairman of the Technical Committee and the Project Secretary should
    make decisions only when absolutely necessary and only when consistent
    with the consensus of the Developers.
-   
+
 8. The Project Leader's Delegates
 
   8.1. Powers
-  
+
    The Project Leader's Delegates:
     1. have powers delegated to them by the Project Leader;
     2. may make certain decisions which the Leader may not make directly,
        including approving or expelling Developers or designating people
        as Developers who do not maintain packages. This is to avoid
        concentration of power, particularly over membership as a
-       Developer, in the hands of the Project Leader. 
-       
+       Developer, in the hands of the Project Leader.
+
   8.2. Appointment
-  
+
    The Delegates are appointed by the Project Leader and may be replaced
    by the Leader at the Leader's discretion. The Project Leader may not
    make the position as a Delegate conditional on particular decisions by
    the Delegate, nor may they override a decision made by a Delegate once
    made.
-   
+
   8.3. Procedure
-  
+
    Delegates may make decisions as they see fit, but should attempt to
    implement good technical decisions and/or follow consensus opinion.
-   
+
 9. Software in the Public Interest
 
    SPI and Debian are separate organisations who share some goals. Debian
    is grateful for the legal support framework offered by SPI. Debian's
    Developers are currently members of SPI by virtue of their status as
-   Developers. 
-   
+   Developers.
+
   9.1. Authority
-  
+
     1. SPI has no authority regarding Debian's technical or nontechnical
        decisions, except that no decision by Debian with respect to any
        property held by SPI shall require SPI to act outside its legal
@@ -413,12 +425,13 @@
        other or of persons in authority in the Debian Project. A person
        acting as a Developer does so as an individual, on their own
        behalf.
-       
+
   9.2. Management of property for purposes related to Debian
-  
+
    Since Debian has no authority to hold money or property, any donations
-   for the Debian Project must made to SPI, which manages such affairs.
-   
+   for the Debian Project must be made to SPI, which manages such
+   affairs.
+
    SPI have made the following undertakings:
     1. SPI will hold money, trademarks and other tangible and intangible
        property and manage other affairs for purposes related to Debian.
@@ -436,19 +449,19 @@
     6. SPI will notify the Developers by electronic mail to a Debian
        Project mailing list when it uses or disposes of property held in
        trust for Debian.
-       
+
 A. Standard Resolution Procedure
 
-   These rules apply to communal decisionmaking by committees and
+   These rules apply to communal decision-making by committees and
    plebiscites, where stated above.
-   
+
   A.1. Proposal
-  
+
    The formal procedure begins when a draft resolution is proposed and
    sponsored, as required.
-   
+
   A.1. Discussion and Amendment
-  
+
     1. Following the proposal, the resolution may be discussed.
        Amendments may be made formal by being proposed and sponsored
        according to the requirements for a new resolution, or directly by
@@ -471,127 +484,119 @@ A. Standard Resolution Procedure
     6. The proposer of a resolution may make changes to correct minor
        errors (for example, typographical errors or inconsistencies) or
        changes which do not alter the meaning, providing noone objects
-       within 24 hours. In this case the mininum discussion period is not
+       within 24 hours. In this case the minimum discussion period is not
        restarted.
-       
+
   A.2. Calling for a vote
-  
+
     1. The proposer or a sponsor of a motion or an amendment may call for
        a vote, providing that the minimum discussion period (if any) has
        elapsed.
-    2. The proposer or a sponsor of a motion may call for a vote on any
-       or all of the amendments individually or together; the proposer or
-       sponsor of an amendment may call for a vote only on that amendment
-       and related amendments.
+    2. The proposer or any sponsor of a resolution may call for a vote on
+       that resolution and all related amendments.
     3. The person who calls for a vote states what they believe the
        wordings of the resolution and any relevant amendments are, and
        consequently what form the ballot should take. However, the final
        decision on the form of ballot(s) is the Secretary's - see 7.1(1),
-       7.1(3) and A.3(6).
+       7.1(3) and A.3(4).
     4. The minimum discussion period is counted from the time the last
-       formal amendment was accepted, or the last related formal
-       amendment was accepted if an amendment is being voted on, or since
-       the whole resolution was proposed if no amendments have been
-       proposed and accepted.
-       
+       formal amendment was accepted, or since the whole resolution was
+       proposed if no amendments have been proposed and accepted.
+
   A.3. Voting procedure
-  
-    1. Each independent set of related amendments is voted on in a
-       separate ballot. Each such ballot has as options all the sensible
-       combinations of amendments and options, and an option Further
-       Discussion. If Further Discussion wins then the entire resolution
-       procedure is set back to the start of the discussion period. No
-       quorum is required for an amendment.
-    2. When the final form of the resolution has been determined it is
-       voted on in a final ballot, in which the options are Yes, No and
-       Further Discussion. If Further Discussion wins then the entire
-       procedure is set back to the start of the discussion period.
-    3. The vote taker (if there is one) or the voters (if voting is done
-       by public pronouncement) may arrange for these ballots to be held
-       simultaneously, even (for example) using a single voting message.
-       If amendment ballot(s) and the final ballot are combined in this
-       way then it must be possible for a voter to vote differently in
-       the final ballot for each of the possible forms of the final draft
-       resolution.
-    4. Votes may be cast during the voting period, as specified
-       elsewhere. If the voting period can end if the outcome is no
-       longer in doubt, the possibility that voters may change their
-       votes is not considered.
-    5. The votes are counted according to the Concorde Vote Counting. If
-       a quorum is required then the default option is Further
-       Discussion.
-    6. In cases of doubt the Project Secretary shall decide on matters of
-       procedure (for example, whether particular amendments should be
-       considered independent or not).
-       
+
+    1. Each resolution and its related amendments is voted on in a single
+       ballot that includes an option for the original resolution, each
+       amendment, and the default option (where applicable).
+    2. The default option must not have any supermajority requirements.
+       Options which do not have an explicit supermajority requirement
+       have a 1:1 majority requirement.
+    3. The votes are counted according to the rules in A.6. The default
+       option is "Further Discussion", unless specified otherwise.
+    4. In cases of doubt the Project Secretary shall decide on matters of
+       procedure.
+
   A.4. Withdrawing resolutions or unaccepted amendments
-  
+
    The proposer of a resolution or unaccepted amendment may withdraw it.
    In this case new proposers may come forward keep it alive, in which
    case the first person to do so becomes the new proposer and any others
    become sponsors if they aren't sponsors already.
-   
+
    A sponsor of a resolution or amendment (unless it has been accepted)
    may withdraw.
-   
+
    If the withdrawal of the proposer and/or sponsors means that a
    resolution has no proposer or not enough sponsors it will not be voted
    on unless this is rectified before the resolution expires.
-   
+
   A.5. Expiry
-  
+
    If a proposed resolution has not been discussed, amended, voted on or
-   otherwise dealt with for 4 weeks then it is considered to have been
-   withdrawn.
-   
-  A.6. Concorde Vote Counting
-  
-    1. This is used to determine the winner amongst a list of options.
-       Each ballot paper gives a ranking of the voter's preferred
-       options. (The ranking need not be complete.)
-    2. Option A is said to Dominate option B if strictly more ballots
-       prefer A to B than prefer B to A.
-    3. All options which are Dominated by at least one other option are
-       discarded, and references to them in ballot papers will be
-       ignored.
-    4. If there is any option which Dominates all others then that is the
-       winner.
-    5. If there is now more than one option remaining Single
-       Transferrable Vote will be applied to choose amongst those
-       remaining:
-          + The number of first preferences for each option is counted,
-            and if any option has more than half it is the winner.
-          + Otherwise the option with the lowest number of first
-            preferences is eliminated and its votes redistributed
-            according to the second preferences.
-          + This elimination procedure is repeated, moving down ballot
-            papers to 2nd, 3rd, 4th, etc. preferences as required, until
-            one option gets more than half of the `first' preferences.
-    6. In the case of ties the elector with a casting vote will decide.
-       The casting vote does not count as a normal vote; however that
-       elector will usually also get a normal vote.
-    7. If a supermajority is required the number of Yes votes in the
-       final ballot is reduced by an appropriate factor. Strictly
-       speaking, for a supermajority of F:A, the number of ballots which
-       prefer Yes to X (when considering whether Yes Dominates X or X
-       Dominates Yes) or the number of ballots whose first (remaining)
-       preference is Yes (when doing STV comparisons for winner and
-       elimination purposes) is multiplied by a factor A/F before the
-       comparison is done. This means that a 2:1 vote, for example, means
-       twice as many people voted for as against; abstentions are not
-       counted. 
-    8. If a quorum is required, there must be at least that many votes
-       which prefer the winning option to the default option. If there
-       are not then the default option wins after all. For votes
-       requiring a supermajority, the actual number of Yes votes is used
-       when checking whether the quorum has been reached.
-       
+   otherwise dealt with for 4 weeks the secretary may issue a statement
+   that the issue is being withdrawn. If none of the sponsors of any of
+   the proposals object within a week, the issue is withdrawn.
+
+   The secretary may also include suggestions on how to proceed, if
+   appropriate.
+
+  A.6. Vote Counting
+
+    1. Each voter's ballot ranks the options being voted on. Not all
+       options need be ranked. Ranked options are considered preferred to
+       all unranked options. Voters may rank options equally. Unranked
+       options are considered to be ranked equally with one another.
+       Details of how ballots may be filled out will be included in the
+       Call For Votes.
+    2. If the ballot has a quorum requirement R any options other than
+       the default option which do not receive at least R votes ranking
+       that option above the default option are dropped from
+       consideration.
+    3. Any (non-default) option which does not defeat the default option
+       by its required majority ratio is dropped from consideration.
+         1. Given two options A and B, V(A,B) is the number of voters who
+            prefer option A over option B.
+         2. An option A defeats the default option D by a majority ratio
+            N, if V(A,D) is strictly greater than N * V(D,A).
+         3. If a supermajority of S:1 is required for A, its majority
+            ratio is S; otherwise, its majority ratio is 1.
+    4. From the list of undropped options, we generate a list of pairwise
+       defeats.
+         1. An option A defeats an option B, if V(A,B) is strictly
+            greater than V(B,A).
+    5. From the list of [undropped] pairwise defeats, we generate a set
+       of transitive defeats.
+         1. An option A transitively defeats an option C if A defeats C
+            or if there is some other option B where A defeats B AND B
+            transitively defeats C.
+    6. We construct the Schwartz set from the set of transitive defeats.
+         1. An option A is in the Schwartz set if for all options B,
+            either A transitively defeats B, or B does not transitively
+            defeat A.
+    7. If there are defeats between options in the Schwartz set, we drop
+       the weakest such defeats from the list of pairwise defeats, and
+       return to step 5.
+         1. A defeat (A,X) is weaker than a defeat (B,Y) if V(A,X) is
+            less than V(B,Y). Also, (A,X) is weaker than (B,Y) if V(A,X)
+            is equal to V(B,Y) and V(X,A) is greater than V(Y,B).
+         2. A weakest defeat is a defeat that has no other defeat weaker
+            than it. There may be more than one such defeat.
+    8. If there are no defeats within the Schwartz set, then the winner
+       is chosen from the options in the Schwartz set. If there is only
+       one such option, it is the winner. If there are multiple options,
+       the elector with the casting vote chooses which of those options
+       wins.
+
+   Note: Options which the voters rank above the default option are
+   options they find acceptable. Options ranked below the default options
+   are options they find unacceptable.
+
    When the Standard Resolution Procedure is to be used, the text which
    refers to it must specify what is sufficient to have a draft
    resolution proposed and/or sponsored, what the minimum discussion
    period is, and what the voting period is. It must also specify any
    supermajority and/or the quorum (and default option) to be used.
-   
+
 B. Use of language and typography
 
    The present indicative (`is', for example) means that the statement is
@@ -600,4 +605,4 @@ B. Use of language and typography
    good thing if the sentence were obeyed, but it is not binding. Text
    marked as a citation, such as this, is rationale and does not form
    part of the constitution. It may be used only to aid interpretation in
-   cases of doubt. 
+   cases of doubt.
diff --git a/includes/common/doc/debian-manifesto b/includes/etch/install/doc/debian-manifesto
index 9322c93..9322c93 100644
--- a/includes/common/doc/debian-manifesto
+++ b/includes/etch/install/doc/debian-manifesto
diff --git a/includes/common/doc/mailing-lists.txt b/includes/etch/install/doc/mailing-lists.txt
index 2d92973..5d4a6ed 100644
--- a/includes/common/doc/mailing-lists.txt
+++ b/includes/etch/install/doc/mailing-lists.txt
@@ -686,12 +686,20 @@ Development lists
       Moderated   : no
       Subscription: open
 
+  debian-kernel-maint@lists.debian.org
+
+      Description : Discussion and development of Debian kernel packaging,
+                    for the kernel team and other developers.
+      Moderated   : no
+      Subscription: open
+
   debian-kernel@lists.debian.org
 
-      Description : Discussion about kernels used with Debian (Linux, Hurd,
-                    etc.), available patches and flavors, packaging issues,
-                    bug reports, porting issues, automated tools, and any
-                    other questions or patches that are kernel-related.
+      Description : Kernels used with Debian (Linux, Hurd, etc.), available
+                    patches and flavors, packaging issues, bug reports,
+                    porting issues, automated tools, and any other
+                    questions or patches that are kernel-related. Mostly
+                    bug reporting is done here.
       Moderated   : no
       Subscription: open
 
@@ -1089,6 +1097,14 @@ Internationalization and Translations
       Moderated   : no
       Subscription: open
 
+  debian-l10n-galician@lists.debian.org
+
+      Description : Discussing Galician localization issues, mainly translating Debian docs and
+                    programs to Galician.
+      Language    : Galician
+      Moderated   : no
+      Subscription: open
+
   debian-l10n-german@lists.debian.org
 
       Description : Discussing German localization issues, mainly
@@ -1127,6 +1143,14 @@ Internationalization and Translations
       Moderated   : no
       Subscription: open
 
+  debian-l10n-persian@lists.debian.org
+
+      Description : Discussing Persian/Farsi localization issues, mainly translating
+                    Debian docs and programs to Persian/Farsi.
+      Language    : Persian
+      Moderated   : no
+      Subscription: open
+
   debian-l10n-polish@lists.debian.org
 
       Description : Polish localization issues, mainly translating Debian
@@ -1511,7 +1535,7 @@ Miscellaneous Debian lists
       Description : Important changes to the FTP archive are announced here.
                     These are mainly useful to maintainers of Debian
                     mirrors.
-      Moderated   : yes
+      Moderated   : signed
       Subscription: open
 
   debian-mirrors@lists.debian.org
diff --git a/includes/etch/install/doc/social-contract.txt b/includes/etch/install/doc/social-contract.txt
new file mode 100644
index 0000000..e0ddb27
--- /dev/null
+++ b/includes/etch/install/doc/social-contract.txt
@@ -0,0 +1,120 @@
+
+   Version 1.0 ratified on July 5, 1997. Superseded by Version 1.1,
+   ratified on April 26, 2004.
+
+   Debian, the producers of the Debian GNU/Linux system, have created the
+   Debian Social Contract. The Debian Free Software Guidelines (DFSG)
+   part of the contract, initially designed as a set of commitments that
+   we agree to abide by, has been adopted by the free software community
+   as the basis of the Open Source Definition.
+     _________________________________________________________________
+
+"Social Contract" with the Free Software Community
+
+    1. Debian Will Remain 100% Free Software
+       We promise to keep the Debian GNU/Linux Distribution entirely free
+       software. As there are many definitions of free software, we
+       include the guidelines we use to determine if software is "free"
+       below. We will support our users who develop and run non-free
+       software on Debian, but we will never make the system depend on an
+       item of non-free software.
+    2. We Will Give Back to the Free Software Community
+       When we write new components of the Debian system, we will license
+       them as free software. We will make the best system we can, so
+       that free software will be widely distributed and used. We will
+       feed back bug-fixes, improvements, user requests, etc. to the
+       "upstream" authors of software included in our system.
+    3. We Won't Hide Problems
+       We will keep our entire bug-report database open for public view
+       at all times. Reports that users file on-line will immediately
+       become visible to others.
+    4. Our Priorities are Our Users and Free Software
+       We will be guided by the needs of our users and the free-software
+       community. We will place their interests first in our priorities.
+       We will support the needs of our users for operation in many
+       different kinds of computing environment. We won't object to
+       commercial software that is intended to run on Debian systems, and
+       we'll allow others to create value-added distributions containing
+       both Debian and commercial software, without any fee from us. To
+       support these goals, we will provide an integrated system of
+       high-quality, 100% free software, with no legal restrictions that
+       would prevent these kinds of use.
+    5. Programs That Don't Meet Our Free-Software Standards
+       We acknowledge that some of our users require the use of programs
+       that don't conform to the Debian Free Software Guidelines. We have
+       created "contrib" and "non-free" areas in our FTP archive for this
+       software. The software in these directories is not part of the
+       Debian system, although it has been configured for use with
+       Debian. We encourage CD manufacturers to read the licenses of
+       software packages in these directories and determine if they can
+       distribute that software on their CDs. Thus, although non-free
+       software isn't a part of Debian, we support its use, and we
+       provide infrastructure (such as our bug-tracking system and
+       mailing lists) for non-free software packages.
+     _________________________________________________________________
+
+The Debian Free Software Guidelines (DFSG)
+
+    1. Free Redistribution
+       The license of a Debian component may not restrict any party from
+       selling or giving away the software as a component of an aggregate
+       software distribution containing programs from several different
+       sources. The license may not require a royalty or other fee for
+       such sale.
+    2. Source Code
+       The program must include source code, and must allow distribution
+       in source code as well as compiled form.
+    3. Derived Works
+       The license must allow modifications and derived works, and must
+       allow them to be distributed under the same terms as the license
+       of the original software.
+    4. Integrity of The Author's Source Code
+       The license may restrict source-code from being distributed in
+       modified form _only_ if the license allows the distribution of
+       "patch files" with the source code for the purpose of modifying
+       the program at build time. The license must explicitly permit
+       distribution of software built from modified source code. The
+       license may require derived works to carry a different name or
+       version number from the original software. (This is a compromise.
+       The Debian group encourages all authors not to restrict any files,
+       source or binary, from being modified.)
+    5. No Discrimination Against Persons or Groups
+       The license must not discriminate against any person or group of
+       persons.
+    6. No Discrimination Against Fields of Endeavor
+       The license must not restrict anyone from making use of the
+       program in a specific field of endeavor. For example, it may not
+       restrict the program from being used in a business, or from being
+       used for genetic research.
+    7. Distribution of License
+       The rights attached to the program must apply to all to whom the
+       program is redistributed without the need for execution of an
+       additional license by those parties.
+    8. License Must Not Be Specific to Debian
+       The rights attached to the program must not depend on the
+       program's being part of a Debian system. If the program is
+       extracted from Debian and used or distributed without Debian but
+       otherwise within the terms of the program's license, all parties
+       to whom the program is redistributed should have the same rights
+       as those that are granted in conjunction with the Debian system.
+    9. License Must Not Contaminate Other Software
+       The license must not place restrictions on other software that is
+       distributed along with the licensed software. For example, the
+       license must not insist that all other programs distributed on the
+       same medium must be free software.
+   10. Example Licenses
+       The "GPL", "BSD", and "Artistic" licenses are examples of licenses
+       that we consider "free".
+
+   The concept of stating our "social contract with the free software
+   community" was suggested by Ean Schuessler. This document was drafted
+   by Bruce Perens, refined by the other Debian developers during a
+   month-long e-mail conference in June 1997, and then accepted as the
+   publicly stated policy of the Debian Project.
+
+   Bruce Perens later removed the Debian-specific references from the
+   Debian Free Software Guidelines to create "The Open Source
+   Definition".
+
+   Other organizations may derive from and build on this document. Please
+   give credit to the Debian project if you do.
diff --git a/includes/common/doc/source-unpack.txt b/includes/etch/install/doc/source-unpack.txt
index 151b733..151b733 100644
--- a/includes/common/doc/source-unpack.txt
+++ b/includes/etch/install/doc/source-unpack.txt
diff --git a/includes/common/pics/blue-lowerleft.png b/includes/etch/install/pics/blue-lowerleft.png
index 2a2245e..2a2245e 100644
--- a/includes/common/pics/blue-lowerleft.png
+++ b/includes/etch/install/pics/blue-lowerleft.png
diff --git a/includes/common/pics/blue-lowerright.png b/includes/etch/install/pics/blue-lowerright.png
index 7e66271..7e66271 100644
--- a/includes/common/pics/blue-lowerright.png
+++ b/includes/etch/install/pics/blue-lowerright.png
diff --git a/includes/common/pics/blue-upperleft.png b/includes/etch/install/pics/blue-upperleft.png
index a58d0ec..a58d0ec 100644
--- a/includes/common/pics/blue-upperleft.png
+++ b/includes/etch/install/pics/blue-upperleft.png
diff --git a/includes/common/pics/blue-upperright.png b/includes/etch/install/pics/blue-upperright.png
index 2f36849..2f36849 100644
--- a/includes/common/pics/blue-upperright.png
+++ b/includes/etch/install/pics/blue-upperright.png
diff --git a/includes/common/pics/debian.jpg b/includes/etch/install/pics/debian.jpg
index db62d7a..db62d7a 100644
--- a/includes/common/pics/debian.jpg
+++ b/includes/etch/install/pics/debian.jpg
diff --git a/includes/common/pics/logo-50.jpg b/includes/etch/install/pics/logo-50.jpg
index 542f0a4..542f0a4 100644
--- a/includes/common/pics/logo-50.jpg
+++ b/includes/etch/install/pics/logo-50.jpg
diff --git a/includes/common/pics/red-lowerleft.png b/includes/etch/install/pics/red-lowerleft.png
index caca9c5..caca9c5 100644
--- a/includes/common/pics/red-lowerleft.png
+++ b/includes/etch/install/pics/red-lowerleft.png
diff --git a/includes/common/pics/red-lowerright.png b/includes/etch/install/pics/red-lowerright.png
index c27056c..c27056c 100644
--- a/includes/common/pics/red-lowerright.png
+++ b/includes/etch/install/pics/red-lowerright.png
diff --git a/includes/common/pics/red-upperleft.png b/includes/etch/install/pics/red-upperleft.png
index c1e3301..c1e3301 100644
--- a/includes/common/pics/red-upperleft.png
+++ b/includes/etch/install/pics/red-upperleft.png
diff --git a/includes/common/pics/red-upperright.png b/includes/etch/install/pics/red-upperright.png
index 54d17ca..54d17ca 100644
--- a/includes/common/pics/red-upperright.png
+++ b/includes/etch/install/pics/red-upperright.png
diff --git a/includes/common/tools/README b/includes/etch/install/tools/README
index bc56f93..bc56f93 100644
--- a/includes/common/tools/README
+++ b/includes/etch/install/tools/README
diff --git a/includes/common/tools/diskio.zip b/includes/etch/install/tools/diskio.zip
index b30fa96..b30fa96 100644
--- a/includes/common/tools/diskio.zip
+++ b/includes/etch/install/tools/diskio.zip
diff --git a/includes/common/tools/fips20.zip b/includes/etch/install/tools/fips20.zip
index c4a64b6..c4a64b6 100644
--- a/includes/common/tools/fips20.zip
+++ b/includes/etch/install/tools/fips20.zip
diff --git a/includes/common/tools/gzip124.exe b/includes/etch/install/tools/gzip124.exe
index 1a8d137..1a8d137 100644
--- a/includes/common/tools/gzip124.exe
+++ b/includes/etch/install/tools/gzip124.exe
diff --git a/includes/common/tools/lodlin16.zip b/includes/etch/install/tools/lodlin16.zip
index 50ad313..50ad313 100644
--- a/includes/common/tools/lodlin16.zip
+++ b/includes/etch/install/tools/lodlin16.zip
diff --git a/includes/common/tools/md5sum-w32.zip b/includes/etch/install/tools/md5sum-w32.zip
index 982202b..982202b 100644
--- a/includes/common/tools/md5sum-w32.zip
+++ b/includes/etch/install/tools/md5sum-w32.zip
diff --git a/includes/common/tools/rawrite1.zip b/includes/etch/install/tools/rawrite1.zip
index abdc229..abdc229 100644
--- a/includes/common/tools/rawrite1.zip
+++ b/includes/etch/install/tools/rawrite1.zip
diff --git a/includes/common/tools/rawrite2.zip b/includes/etch/install/tools/rawrite2.zip
index aa33885..aa33885 100644
--- a/includes/common/tools/rawrite2.zip
+++ b/includes/etch/install/tools/rawrite2.zip
diff --git a/includes/common/tools/rwwrtwin.zip b/includes/etch/install/tools/rwwrtwin.zip
index 2c3fd11..2c3fd11 100644
--- a/includes/common/tools/rwwrtwin.zip
+++ b/includes/etch/install/tools/rwwrtwin.zip
diff --git a/includes/common/tools/src/md5sum-w32_1.1.dsc b/includes/etch/install/tools/src/md5sum-w32_1.1.dsc
index 44393f8..44393f8 100644
--- a/includes/common/tools/src/md5sum-w32_1.1.dsc
+++ b/includes/etch/install/tools/src/md5sum-w32_1.1.dsc
diff --git a/includes/common/tools/src/md5sum-w32_1.1.tar.gz b/includes/etch/install/tools/src/md5sum-w32_1.1.tar.gz
index bf42ec8..bf42ec8 100644
--- a/includes/common/tools/src/md5sum-w32_1.1.tar.gz
+++ b/includes/etch/install/tools/src/md5sum-w32_1.1.tar.gz
diff --git a/includes/common/tools/unz512x3.exe b/includes/etch/install/tools/unz512x3.exe
index e8b36c8..e8b36c8 100644
--- a/includes/common/tools/unz512x3.exe
+++ b/includes/etch/install/tools/unz512x3.exe
diff --git a/includes/sid b/includes/sid
new file mode 120000
index 0000000..5f12354
--- /dev/null
+++ b/includes/sid
@@ -0,0 +1 @@
+etch/
\ No newline at end of file
diff --git a/includes/usb/autorun.bat b/includes/usb/autorun.bat
deleted file mode 100644
index 4718afe..0000000
--- a/includes/usb/autorun.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo Starting "README.html"...

-@start README.html

-@exit

diff --git a/includes/usb/autorun.inf b/includes/usb/autorun.inf
deleted file mode 100644
index 1b28f75..0000000
--- a/includes/usb/autorun.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-[autorun]

-open=autorun.bat

diff --git a/manpages/lh_binary.1 b/manpages/lh_binary.1
index 72c694a..1e2bf35 100644
--- a/manpages/lh_binary.1
+++ b/manpages/lh_binary.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "2007\-04\-09" "1.0~a5" "live\-helper"
+.TH LH_BINARY 1 "2007\-04\-16" "1.0~a6" "live\-helper"
 
 .SH NAME
 lh_binary \- meta-helper for lh_binary_*
@@ -31,8 +31,8 @@ copies local files into the binary image.
 creates the package list of the root filesystem.
 .IP "\fIlh_binary_md5sum\fR(1)" 4
 creates md5sum.txt in the binary image.
-.IP "\fIlh_binary_memtest86\fR(1)" 4
-copies memtest86 into the binary image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+copies a memtest into the binary image.
 .IP "\fIlh_binary_net\fR(1)" 4
 creates the netboot binary tarball.
 .IP "\fIlh_binary_rootfs\fR(1)" 4
@@ -41,6 +41,8 @@ creates the root filesystem.
 copies syslinux into the binary image.
 .IP "\fIlh_binary_usb\fR(1)" 4
 creates the USB binary image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+copies yaboot into the binary image.
 
 .SH SEE ALSO
 \fIlive\-helper\fR(7)
diff --git a/manpages/lh_bootstrap.1 b/manpages/lh_bootstrap.1
index ff59cc0..51a90ad 100644
--- a/manpages/lh_bootstrap.1
+++ b/manpages/lh_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "2007\-04\-09" "1.0~a5" "live\-helper"
+.TH LH_BOOTSTRAP 1 "2007\-04\-16" "1.0~a6" "live\-helper"
 
 .SH NAME
 lh_bootstrap \- meta-helper for lh_bootstrap_*
diff --git a/manpages/lh_bootstrap_cdebootstrap.1 b/manpages/lh_bootstrap_cdebootstrap.1
index 2195a57..80587b7 100644
--- a/manpages/lh_bootstrap_cdebootstrap.1
+++ b/manpages/lh_bootstrap_cdebootstrap.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-04\-09" "1.0~a5" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-04\-16" "1.0~a6" "live\-helper"
 
 .SH NAME
 lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_debootstrap.1 b/manpages/lh_bootstrap_debootstrap.1
index 0220278..24894c5 100644
--- a/manpages/lh_bootstrap_debootstrap.1
+++ b/manpages/lh_bootstrap_debootstrap.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-04\-09" "1.0~a5" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-04\-16" "1.0~a6" "live\-helper"
 
 .SH NAME
 lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
diff --git a/manpages/lh_chroot.1 b/manpages/lh_chroot.1
index 9cb6854..c67e377 100644
--- a/manpages/lh_chroot.1
+++ b/manpages/lh_chroot.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "2007\-04\-09" "1.0~a5" "live\-helper"
+.TH LH_CHROOT 1 "2007\-04\-16" "1.0~a6" "live\-helper"
 
 .SH NAME
 lh_chroot \- meta-helper for lh_chroot_*
diff --git a/manpages/lh_clean.1 b/manpages/lh_clean.1
index 18722b3..163f813 100644
--- a/manpages/lh_clean.1
+++ b/manpages/lh_clean.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "2007\-04\-09" "1.0~a5" "live\-helper"
+.TH LH_CLEAN 1 "2007\-04\-16" "1.0~a6" "live\-helper"
 
 .SH NAME
 lh_clean \- clean up system build directories
diff --git a/manpages/lh_testroot.1 b/manpages/lh_testroot.1
index f924a06..c6b20ef 100644
--- a/manpages/lh_testroot.1
+++ b/manpages/lh_testroot.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "2007\-04\-09" "1.0~a5" "live\-helper"
+.TH LH_TESTROOT 1 "2007\-04\-16" "1.0~a6" "live\-helper"
 
 .SH NAME
 lh_testroot \- ensure that a system is built as root
diff --git a/manpages/live-helper.7 b/manpages/live-helper.7
index 0046e01..2f2f4b4 100644
--- a/manpages/live-helper.7
+++ b/manpages/live-helper.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "2007\-04\-09" "1.0~a5" "live\-helper"
+.TH LIVE\-HELPER 7 "2007\-04\-16" "1.0~a6" "live\-helper"
 
 .SH NAME
 live\-helper \- Debian Live helper programs
@@ -47,8 +47,8 @@ copies local files into the binary image.
 creates the package list of the root filesystem.
 .IP "\fIlh_binary_md5sum\fR(1)" 4
 creates md5sum.txt in the binary image.
-.IP "\fIlh_binary_memtest86\fR(1)" 4
-copies memtest86 into the binary image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+copies a memtest into the binary image.
 .IP "\fIlh_binary_net\fR(1)" 4
 creates the netboot binary tarball.
 .IP "\fIlh_binary_rootfs\fR(1)" 4
@@ -57,6 +57,8 @@ creates the root filesystem.
 copies syslinux into the binary image.
 .IP "\fIlh_binary_usb\fR(1)" 4
 creates the USB binary image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+copies yaboot into the binary image.
 .IP "\fIlh_bootstrap\fR(1)" 4
 meta-helper for lh_bootstrap_*.
 .IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
diff --git a/templates/grub/menu.lst b/templates/grub/menu.lst
index 30100ef..22355b8 100644
--- a/templates/grub/menu.lst
+++ b/templates/grub/menu.lst
@@ -1,124 +1,7 @@
-# menu.lst - See: grub(8), info grub, update-grub(8)
-#            grub-install(8), grub-floppy(8),
-#            grub-md5-crypt, /usr/share/doc/grub
-#            and /usr/share/doc/grub-doc/.
-
-## default num
-# Set the default entry to the entry number NUM. Numbering starts from 0, and
-# the entry number 0 is the default if the command is not used.
-#
-# You can specify 'saved' instead of a number. In this case, the default entry
-# is the entry saved with the command 'savedefault'.
-# WARNING: If you are using dmraid do not change this entry to 'saved' or your
-# array will desync and will not let you boot your system.
-default		0
-
-## timeout sec
-# Set a timeout, in SEC seconds, before automatically booting the default entry
-# (normally the first entry defined).
-#timeout	5
-
-# Pretty colours
+default 0
 color cyan/blue white/blue
-
-## password ['--md5'] passwd
-# If used in the first section of a menu file, disable all interactive editing
-# control (menu entry editor and command-line)  and entries protected by the
-# command 'lock'
-# e.g. password topsecret
-#      password --md5 $1$gLhU0/$aW78kHK1QfV3P2b2znUoe/
-# password topsecret
-
-#
-# examples
-#
-# title		Windows 95/98/NT/2000
-# root		(hd0,0)
-# makeactive
-# chainloader	+1
-#
-# title		Linux
-# root		(hd0,1)
-# kernel	/vmlinuz root=/dev/hda2 ro
-#
-
-#
-# Put static boot stanzas before and/or after AUTOMAGIC KERNEL LIST
-
-### BEGIN AUTOMAGIC KERNELS LIST
-## lines between the AUTOMAGIC KERNELS LIST markers will be modified
-## by the debian update-grub script except for the default options below
-
-## DO NOT UNCOMMENT THEM, Just edit them to your needs
-
-## ## Start Default Options ##
-## default kernel options
-## default kernel options for automagic boot options
-## If you want special options for specific kernels use kopt_x_y_z
-## where x.y.z is kernel version. Minor versions can be omitted.
-## e.g. kopt=root=/dev/hda1 ro
-##      kopt_2_6_8=root=/dev/hdc1 ro
-##      kopt_2_6_8_2_686=root=/dev/hdc2 ro
-# kopt=root=/dev/hda1 ro
-
-## default grub root device
-## e.g. groot=(hd0,0)
-# groot=(hd0,0)
-
-## should update-grub create alternative automagic boot options
-## e.g. alternative=true
-##      alternative=false
-# alternative=true
-
-## should update-grub lock alternative automagic boot options
-## e.g. lockalternative=true
-##      lockalternative=false
-# lockalternative=false
-
-## additional options to use with the default boot option, but not with the
-## alternatives
-## e.g. defoptions=vga=791 resume=/dev/hda5
-# defoptions=
-
-## should update-grub lock old automagic boot options
-## e.g. lockold=false
-##      lockold=true
-# lockold=false
-
-## Xen hypervisor options to use with the default Xen boot option
-# xenhopt=
-
-## Xen Linux kernel options to use with the default Xen boot option
-# xenkopt=console=tty0
-
-## altoption boot targets option
-## multiple altoptions lines are allowed
-## e.g. altoptions=(extra menu suffix) extra boot options
-##      altoptions=(single-user) single
-# altoptions=(single-user mode) single
-
-## controls how many kernels should be put into the menu.lst
-## only counts the first occurence of a kernel, not the
-## alternative kernel options
-## e.g. howmany=all
-##      howmany=7
-# howmany=all
-
-## should update-grub create memtest86 boot option
-## e.g. memtest86=true
-##      memtest86=false
-# memtest86=true
-
-## should update-grub adjust the value of the default booted system
-## can be true or false
-# updatedefaultentry=false
-
-## ## End Default Options ##
-
-LIVE_SPLASH
+splashimage /boot/grub/splash.xpm.gz
 
 LIVE_KERNEL_LIVE
 
 LIVE_KERNEL_INSTALL
-
-### END DEBIAN AUTOMAGIC KERNELS LIST
diff --git a/templates/grub/splash.xpm.gz b/templates/grub/splash.xpm.gz
new file mode 100644
index 0000000..ea1623b
--- /dev/null
+++ b/templates/grub/splash.xpm.gz
diff --git a/templates/syslinux/f3.txt b/templates/syslinux/f3.txt
index 0910282..e987a61 100644
--- a/templates/syslinux/f3.txt
+++ b/templates/syslinux/f3.txt
@@ -2,7 +2,7 @@
 
 0fAvailable boot methods:07
 
-0flinux07
+0flive07
   Start the live system -- this is the default CD-ROM mode.
 0fmemtest07
   Start the memtest86+ RAM tester.
@@ -10,7 +10,7 @@
 To use one of these boot methods, type it at the prompt, optionally
 followed by any boot parameters. For example:
 
-  boot: linux foo=bar
+  boot: live foo=bar
 
 If unsure, you should use the default boot method, with no special
 parameters, by simply pressing enter at the boot prompt.
diff --git a/templates/syslinux/f4.txt b/templates/syslinux/f4.txt
index 24198cb..a8bd4e0 100644
--- a/templates/syslinux/f4.txt
+++ b/templates/syslinux/f4.txt
@@ -14,7 +14,7 @@ Set initial display mode               0fvga=<mode>07
 
 For example:
 
-  boot: linux quiet vga=792 locale=it_IT.UTF-8
+  boot: live quiet vga=792 locale=it_IT.UTF-8
 
 
 
diff --git a/templates/yaboot/boot.msg b/templates/yaboot/boot.msg
new file mode 100644
index 0000000..9c25a9c
--- /dev/null
+++ b/templates/yaboot/boot.msg
@@ -0,0 +1,18 @@
+Welcome to Debian GNU/Linux
+
+This is an Debian Live CDROM,
+built on LIVE_DATE.
+
+The default option is 'live'.
+
+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.
+
+************************************
+If in doubt, just press Enter, and if that
+doesn't work, type 'live video=ofonly'.
+************************************
diff --git a/templates/yaboot/yaboot.conf b/templates/yaboot/yaboot.conf
new file mode 100644
index 0000000..8170d70
--- /dev/null
+++ b/templates/yaboot/yaboot.conf
@@ -0,0 +1,6 @@
+default=live
+message=/install/boot.msg
+
+LIVE_KERNEL_LIVE
+
+LIVE_KERNEL_INSTALL