Subject: Adding live-helper 1.0~a7-1.

From: Daniel Baumann <[email-masked]>
Date: Sun, 23 Sep 2007 10:04:51 +0200

---
 Makefile                                |  54 ++++++++--
 debian/changelog                        |  17 +++-
 debian/cron.daily                       | 128 +++++++++++++++++++++++
 debian/default                          |  15 +++
 debian/rules                            |   8 +-
 doc/BUGS                                |  51 ++++++++++
 doc/ChangeLog                           |  56 +++++++++++
 doc/DOWNLOAD                            |  43 ++++++++
 doc/FAQ                                 |  41 +++++++-
 doc/NEWS                                |   3 +
 examples/beryl-hook.sh                  |  14 +--
 examples/beryl.sources.list             |  14 +++
 examples/daily-cron.sh                  | 136 +++++++++++++++++++++++++
 examples/edu.sources.list               |  11 ++
 examples/etch+beryl-cron.sh             | 146 +++++++++++++++++++++++++++
 examples/etch-cron.sh                   | 136 +++++++++++++++++++++++++
 examples/fai.sources.list               |   9 ++
 examples/weekly-cron.sh                 | 136 +++++++++++++++++++++++++
 functions/arguments.sh                  |  10 +-
 functions/breakpoints.sh                |   6 +-
 functions/chroot.sh                     |   2 +-
 functions/common.sh                     |   2 +-
 functions/defaults.sh                   |  22 +++-
 functions/echo.sh                       |  20 +++-
 functions/exit.sh                       |   1 +
 functions/package.sh                    |  53 ++++++++++
 functions/stagefile.sh                  |   9 +-
 helpers/lh_binary_chroot                |  19 ++--
 helpers/lh_binary_encryption            |  35 ++-----
 helpers/lh_binary_grub                  |  45 +++------
 helpers/lh_binary_iso                   |  47 +++------
 helpers/lh_binary_memtest               |  41 ++------
 helpers/lh_binary_rootfs                |  89 ++++++----------
 helpers/lh_binary_syslinux              |  92 ++++++++---------
 helpers/lh_binary_usb                   |  62 +++---------
 helpers/lh_binary_yaboot                |  36 ++-----
 helpers/lh_bootstrap_cdebootstrap       |  28 +++++-
 helpers/lh_bootstrap_debootstrap        |  28 +++++-
 helpers/lh_chroot                       |   2 +-
 helpers/lh_chroot_hacks                 |   7 +-
 helpers/lh_chroot_hooks                 |  35 ++++---
 helpers/lh_chroot_localization          |  40 ++------
 helpers/lh_chroot_proc                  |   8 +-
 helpers/lh_chroot_sources               |  62 ++++++++----
 helpers/lh_chroot_symlinks              |  38 ++-----
 helpers/lh_chroot_sysfs                 |   4 +-
 helpers/lh_chroot_tasks                 |  72 ++++++-------
 helpers/lh_clean                        |  18 ++--
 helpers/lh_config                       |  10 ++
 helpers/lh_losetup                      |  10 +-
 helpers/lh_source_generic               |   1 +
 helpers/lh_source_hdd                   |   1 +
 helpers/lh_source_usb                   |  46 ++-------
 helpers/lh_testroot                     |   6 +-
 helpers/make-live                       |  20 +++-
 hooks/kde-desktop                       |  14 +++
 includes/sid                            |   2 +-
 lists/rescue                            |   2 +-
 manpages/lh_binary.1                    |  59 -----------
 manpages/lh_binary.1.de                 |  59 +++++++++++
 manpages/lh_binary.1.en                 |  59 +++++++++++
 manpages/lh_bootstrap.1                 |  31 ------
 manpages/lh_bootstrap.1.de              |  31 ++++++
 manpages/lh_bootstrap.1.en              |  31 ++++++
 manpages/lh_bootstrap_cdebootstrap.1    |  47 ---------
 manpages/lh_bootstrap_cdebootstrap.1.de |  47 +++++++++
 manpages/lh_bootstrap_cdebootstrap.1.en |  47 +++++++++
 manpages/lh_bootstrap_debootstrap.1     |  47 ---------
 manpages/lh_bootstrap_debootstrap.1.de  |  47 +++++++++
 manpages/lh_bootstrap_debootstrap.1.en  |  47 +++++++++
 manpages/lh_build.1.de                  |  35 +++++++
 manpages/lh_build.1.en                  |  35 +++++++
 manpages/lh_chroot.1                    |  71 -------------
 manpages/lh_chroot.1.de                 |  71 +++++++++++++
 manpages/lh_chroot.1.en                 |  71 +++++++++++++
 manpages/lh_clean.1                     |  44 --------
 manpages/lh_clean.1.de                  |  44 ++++++++
 manpages/lh_clean.1.en                  |  44 ++++++++
 manpages/lh_source.1.de                 |  43 ++++++++
 manpages/lh_source.1.en                 |  43 ++++++++
 manpages/lh_testroot.1                  |  24 -----
 manpages/lh_testroot.1.de               |  24 +++++
 manpages/lh_testroot.1.en               |  24 +++++
 manpages/live-helper.7                  | 171 -------------------------------
 manpages/live-helper.7.de               | 173 ++++++++++++++++++++++++++++++++
 manpages/live-helper.7.en               | 171 +++++++++++++++++++++++++++++++
 manpages/make-live.1.de                 |  88 ++++++++++++++++
 manpages/make-live.1.en                 |  88 ++++++++++++++++
 templates/syslinux/isolinux.cfg         |   4 +
 89 files changed, 2800 insertions(+), 1083 deletions(-)
 create mode 100644 debian/cron.daily
 create mode 100644 debian/default
 create mode 100644 doc/BUGS
 create mode 100644 doc/DOWNLOAD
 create mode 100644 examples/beryl.sources.list
 create mode 100755 examples/daily-cron.sh
 create mode 100644 examples/edu.sources.list
 create mode 100755 examples/etch+beryl-cron.sh
 create mode 100755 examples/etch-cron.sh
 create mode 100644 examples/fai.sources.list
 create mode 100755 examples/weekly-cron.sh
 create mode 100755 functions/package.sh
 create mode 100755 hooks/kde-desktop
 delete mode 100644 manpages/lh_binary.1
 create mode 100644 manpages/lh_binary.1.de
 create mode 100644 manpages/lh_binary.1.en
 delete mode 100644 manpages/lh_bootstrap.1
 create mode 100644 manpages/lh_bootstrap.1.de
 create mode 100644 manpages/lh_bootstrap.1.en
 delete mode 100644 manpages/lh_bootstrap_cdebootstrap.1
 create mode 100644 manpages/lh_bootstrap_cdebootstrap.1.de
 create mode 100644 manpages/lh_bootstrap_cdebootstrap.1.en
 delete mode 100644 manpages/lh_bootstrap_debootstrap.1
 create mode 100644 manpages/lh_bootstrap_debootstrap.1.de
 create mode 100644 manpages/lh_bootstrap_debootstrap.1.en
 create mode 100644 manpages/lh_build.1.de
 create mode 100644 manpages/lh_build.1.en
 delete mode 100644 manpages/lh_chroot.1
 create mode 100644 manpages/lh_chroot.1.de
 create mode 100644 manpages/lh_chroot.1.en
 delete mode 100644 manpages/lh_clean.1
 create mode 100644 manpages/lh_clean.1.de
 create mode 100644 manpages/lh_clean.1.en
 create mode 100644 manpages/lh_source.1.de
 create mode 100644 manpages/lh_source.1.en
 delete mode 100644 manpages/lh_testroot.1
 create mode 100644 manpages/lh_testroot.1.de
 create mode 100644 manpages/lh_testroot.1.en
 delete mode 100644 manpages/live-helper.7
 create mode 100644 manpages/live-helper.7.de
 create mode 100644 manpages/live-helper.7.en
 create mode 100644 manpages/make-live.1.de
 create mode 100644 manpages/make-live.1.en

diff --git a/Makefile b/Makefile
index f9a15cc..6352613 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,14 @@
 #!/usr/bin/make -f
 
-all:	install
+all: install
 
-install:
+test:
+	set -e; for SCRIPT in functions/* examples/*.sh helpers/* hooks/*; \
+	do \
+		sh -n $$SCRIPT; \
+	done
+
+install: test
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/bin
 	cp helpers/lh_* helpers/make-live $(DESTDIR)/usr/bin
@@ -16,11 +22,25 @@ install:
 	cp -r COPYING doc/* $(DESTDIR)/usr/share/doc/live-helper
 
 	# Installing manpages
-	mkdir -p $(DESTDIR)/usr/share/man/man1
-	cp manpages/*.1 $(DESTDIR)/usr/share/man/man1
+	set -e; for MANPAGE in manpages/*.1.en; \
+	do \
+		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en`; \
+	done
+
+	set -e; for MANPAGE in manpages/*.7.en; \
+	do \
+		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en`; \
+	done
+
+	set -e; for MANPAGE in manpages/*.1.de; \
+	do \
+		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/de/man1/`basename $$MANPAGE .de`; \
+	done
 
-	mkdir -p $(DESTDIR)/usr/share/man/man7
-	cp manpages/*.7 $(DESTDIR)/usr/share/man/man7
+	set -e; for MANPAGE in manpages/*.7.de; \
+	do \
+		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/de/man7/`basename $$MANPAGE .de`; \
+	done
 
 uninstall:
 	# Uninstalling executables
@@ -36,16 +56,28 @@ uninstall:
 	rm -rf $(DESTDIR)/usr/share/doc/live-helper
 
 	# Uninstalling manpages
-	for MANPAGE in manpages/*.1; \
+	set -e; for MANPAGE in manpages/*.1.en; \
+	do \
+		rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en`; \
+	done
+
+	set -e; for MANPAGE in manpages/*.7.en; \
 	do \
-		rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE`; \
+		rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en`; \
 	done
 
-	for MANPAGE in manpages/*.7; \
+	set -e; for MANPAGE in manpages/*.1.de; \
 	do \
-		rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE`; \
+		rm -f $(DESTDIR)/usr/share/man/de/man1/`basename $$MANPAGE .de`; \
+	done
+
+	set -e; for MANPAGE in manpages/*.7.de; \
+	do \
+		rm -f $(DESTDIR)/usr/share/man/de/man7/`basename $$MANPAGE .de`; \
 	done
 
 clean:
 
-reinstall:      uninstall install
+distclean:
+
+reinstall: uninstall install
diff --git a/debian/changelog b/debian/changelog
index 3912ed3..ff1db92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+live-helper (1.0~a7-1) unstable; urgency=medium
+
+  * New upstream release:
+    - make-live unmounts proc and sys on exit and failures
+      (Closes: #394334, #410147).
+    - supporting sudo (Closes: #387069).
+
+ -- Daniel Baumann <[email-masked]>  Mon, 23 Apr 2007 00:00:00 +0200
+
 live-helper (1.0~a6-1) unstable; urgency=low
 
   * New upstream release.
@@ -18,7 +27,7 @@ live-helper (1.0~a4-1) unstable; urgency=low
 
 live-helper (1.0~a3-2) unstable; urgency=low
 
-  * Fixed typo in maintainer scripts.
+  * New upstream snapshot.
 
  -- Daniel Baumann <[email-masked]>  Mon, 26 Mar 2007 17:00:00 +0200
 
@@ -36,15 +45,13 @@ live-helper (1.0~a2-1) unstable; urgency=low
 
 live-helper (1.0~a1-3) unstable; urgency=low
 
-  * helpers/lh_chroot_hacks: Added removal of udev persistent-net rule.
+  * New upstream snapshot.
 
  -- Daniel Baumann <[email-masked]>  Wed, 14 Mar 2007 21:00:00 +0100
 
 live-helper (1.0~a1-2) unstable; urgency=low
 
-  * functions/defaults.sh: Fixed setting of LIVE_SYSVINIT.
-  * helpers/lh_chroot_sysvinit: Changed check for LIVE_SYSVINIT from disabled to
-    enabled.
+  * New upstream snapshot.
 
  -- Daniel Baumann <[email-masked]>  Wed, 14 Mar 2007 18:00:00 +0100
 
diff --git a/debian/cron.daily b/debian/cron.daily
new file mode 100644
index 0000000..ccb9b2b
--- /dev/null
+++ b/debian/cron.daily
@@ -0,0 +1,128 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="daily"
+
+# Check for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Check for live-helper defaults
+if [ -r /etc/default/live-helper ]
+then
+	. /etc/default/live-helper
+else
+	echo "E: /etc/default/live-helper missing."
+	exit 1
+fi
+
+# Check for autobuild
+if [ "${AUTOBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
+# Check for build directory
+if [ ! -d "${AUTOBUILD_TEMPDIR}" ]
+then
+	mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES}
+do
+	for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS}
+		do
+			if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ]
+		then
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+		fi
+
+		if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
+		then
+			# Workaround of missing multi-binary support in live-helper
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
+			rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_*
+			mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
+			cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+		fi
+
+		# Cleanup
+		cd "${AUTOBUILD_TEMPDIR}"/debian-live
+		lh_clean
+		done
+
+	# Cleanup
+	cd "${AUTOBUILD_TEMPDIR}"/debian-live
+	lh_clean purge
+	done
+done
+
+# Cleanup
+if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys
+fi
+
+rm -rf "${AUTOBUILD_TEMPDIR}"
+
+# md5sums
+for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Current symlink
+rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
diff --git a/debian/default b/debian/default
new file mode 100644
index 0000000..5d26a72
--- /dev/null
+++ b/debian/default
@@ -0,0 +1,15 @@
+# Defaults for /etc/cron.daily/live-helper
+
+AUTOBUILD="disabled"
+
+AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`"
+AUTOBUILD_DISTRIBUTIONS="sid"
+AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+AUTOBUILD_OPTIONS="--apt-recommends disabled"
+
+AUTOBUILD_DATE="`date +%Y%m%d`"
+AUTOBUILD_DESTDIR="/srv/debian-live"
+AUTOBUILD_TEMPDIR="/srv/tmp"
+
+AUTOBUILD_MIRROR="http://ftp.debian.org/debian/"
+AUTOBUILD_MIRROR_SECURITY="http://security.debian.org/"
diff --git a/debian/rules b/debian/rules
index 5ed04e6..687cd3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,13 +25,14 @@ install: build
 	# Installing package
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/live-helper
 
-	install -m 644 debian/changelog.old debian/live-helper/usr/share/doc/live-helper/changelog.Debian.old
+	install -D -m 0644 debian/changelog.old debian/live-helper/usr/share/doc/live-helper/changelog.Debian.old
+
+	install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper
 
 	# Removing double files
 	rm -f debian/live-helper/usr/share/doc/live-helper/COPYING
 	rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog
-	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.old \
-		debian/live-helper/usr/share/doc/live-helper/changelog.old
+	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.old debian/live-helper/usr/share/doc/live-helper/changelog.old
 
 binary-arch: build install
 
@@ -41,6 +42,7 @@ binary-indep: build install
 	dh_installchangelogs doc/ChangeLog
 	dh_installdocs
 	dh_install
+	dh_installcron
 	dh_installman
 	dh_compress
 	dh_fixperms
diff --git a/doc/BUGS b/doc/BUGS
new file mode 100644
index 0000000..5d9d295
--- /dev/null
+++ b/doc/BUGS
@@ -0,0 +1,51 @@
+How to report a bug in Debian Live
+==================================
+
+"No software is perfect... we need your help!"
+
+Debian Live is far from being perfect, but we want to make it as close as
+possible to perfect - with your help.
+
+Do not hesitate to report a bug: it is better to fill a report twice than never.
+However, here are some recommendations how to file good bug reports.
+
+
+1. Where does the bug appear?
+-----------------------------
+
+...at build time while bootstrapping?
+
+make-live first bootstraps a basic Debian system with cdebootstrap(1) or
+debootstrap(8). Depending on both cdebootstrap/debootstrap and the Debian
+distribution it is bootstrapping, it runs sucessful or not. If a bug appears
+here, check if the error is related to a specific Debian package (most likely),
+or if it is related to cdebootstrap/debootstrap itself.
+
+In both cases, this is not a bug in Debian Live, but rather in Debian itself. We
+can not fix this directly. Instead, report such a bug against the cdebootstrap
+package, or the failing package.
+
+
+...at build time while installing packages?
+
+Debian Live installs additional packages from the Debian archive. Depending on
+the Debian distribution used and the daily archive state, it can fail. If a bug
+appears here, check if the error is also reproducible on a normal system.
+
+If this is the case, this is not a bug in Debian Live, but rather in Debian
+again. Report it against the failing package.
+
+
+...at run time?
+
+If a package was successfully installed, but fails while actually running the
+Live system, this is probably a bug in Debian Live.
+
+
+2. Where to send the bug report?
+--------------------------------
+
+Report error logs of build time errors to live-package and run time errors to
+casper in the Debian Bug Tracking System. If you are unsure or need more help
+before submitting a bug report, you can always send a message to
+<[email-masked]>. We will help you to figure it out.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 65b5094..3070580 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,59 @@
+2007-04-23  Daniel Baumann  <[email-masked]>
+
+	* Makefile:
+	  - Added simple test rule.
+	* functions/*, helpers/*:
+	  - Added LH_ROOT_COMMAND to support sudo.
+	* functions/package.sh:
+	  - Added. Helper dependencies in-chroot can now be handled by
+	    functions.
+	* helpers/make-live:
+	  - Added trap to unmount proc and sys on exit and failure.
+	* Uploaded 1.0~a7-1.
+
+2007-04-22  Daniel Baumann  <[email-masked]>
+
+	* functions/defaults.sh:
+	  - In ubuntu mode, setting default sections to main restricted.
+	* helpers/lh_binary_grub:
+	  - Making copy call of grub arch independent.
+	* helpers/lh_chroot_sources:
+	  - In debian mode, checking for non-sid rather than if-etch.
+	  - Fixed wrong Ubuntu security URL.
+
+2007-04-20  Daniel Baumann  <[email-masked]>
+
+	* helpers/lh_binary_rootfs, lh_binary_iso:
+	  - Added mksquashfs/genisoimage quiet/verbose options.
+
+2007-04-19  Daniel Baumann  <[email-masked]>
+
+	* helpers/lh_binary_grub, lh_binary_syslinux:
+	  - Added check for splash in config directory.
+
+2007-04-18  Daniel Baumann  <[email-masked]>
+
+	* debian/cron.daily, default:
+	  - Added.
+	* doc/BUGS, DOWNLOAD:
+	  - Added.
+	* examples/edu.sources.list, fai.sources.list:
+	  - Added.
+	* manpages/*:
+	  - Added language suffix.
+	  - Added German translations.
+
+2007-04-17  Daniel Baumann  <[email-masked]>
+
+	* helpers/lh_chroot_hooks:
+	  - Also check for tasks specific hooks, not just for package lists.
+	* helpers/lh_chroot_tasks:
+	  - Allowing to use either aptitude or tasksel.
+	* hooks/kde-desktop:
+	  - Added.
+	* manpages/lh_build.1, lh_source.1:
+	  - Added.
+
 2007-04-16  Daniel Baumann  <[email-masked]>
 
 	* functions/defaults.sh:
diff --git a/doc/DOWNLOAD b/doc/DOWNLOAD
new file mode 100644
index 0000000..60b6753
--- /dev/null
+++ b/doc/DOWNLOAD
@@ -0,0 +1,43 @@
+Download of prebuilt images
+===========================
+
+Although Debian Live is about creating your own customized Live system, we offer
+some prebuilt images as well. Currently, builds for the three desktop
+environments GNOME[0], KDE[1] and Xfce[2] as well as the standard system are
+available. Builds based on testing are created every week and the ones based on
+unstable are build daily. For stable, we build update them when needed.
+
+Currently, the following flavours are autobuilt here (.iso for CD/DVD images,
+.img for USB stick images):
+
+  * debian-live-${DIST}-${ARCH}-standard
+
+    only packages of priority standard or higher and a few live specific
+    packages (eject, file and sudo).
+
+  * debian-live-${DIST}-${ARCH}-gnome-desktop
+
+    the standard system, laptop related packages (laptop task) and the GNOME[1]
+    desktop environment (desktop and gnome-desktop tasks).
+
+  * debian-live-${DIST}-${ARCH}-kde-desktop
+
+    the standard system, laptop related packages (laptop task) and the KDE[2]
+    desktop environment (desktop and kde-desktop tasks).
+
+  * debian-live-${DIST}-${ARCH}-xfce-desktop
+
+    the standard system, laptop related packages (laptop task) and the Xfce[3]
+    desktop environment (desktop and xfce-desktop tasks).
+
+Note: Currently, we build images for lenny (aka "testing") and sid (aka
+"unstable"). Due to the nature of unreleased Debian versions, it is possible
+that no or not all images could be built because of uninstallable packages.
+Please be patient then and wait for the next builds, use the previous, or do it
+on your own by using live-helper. If you want something which works for sure,
+use the etch (aka "stable") builds.
+
+ [0] http://packages.debian.org/live-helper
+ [1] http://www.gnome.org/
+ [2] http://www.kde.org/
+ [3] http://www.xfce.org/
diff --git a/doc/FAQ b/doc/FAQ
index 593346b..ceb87d6 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,5 +1,5 @@
-Debian Live: Frequently Asked Questions (FAQ)
-=============================================
+Frequently Asked Questions (FAQ)
+================================
 
 Build Time
 ----------
@@ -9,10 +9,22 @@ 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 can I build images with an unprevileged user account?
+A: You can use --root-command sudo or set LH_ROOT_COMMAND="sudo" in
+   config/common.
+
+   *BIG* *FAT* *WARNING*: Building an image as non-root can make your image
+   different compared to a regular Debian system (different owners of files). It
+   is *NOT* recommended to build images as non-root. Do *NOT* use this feature
+   yet.
+
+
 Q: How do I drop in to a shell during make-live chroot process?
 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.
@@ -22,6 +34,30 @@ A: casper uses default username 'casper' and hostname 'live'. You can specify
    --hostname to make-live, or alter LIVE_USERNAME and LIVE_HOSTNAME in
    config/image.
 
+
+Q: How can I make my own grub bootsplash?
+A: To add a grub splash screen, you can use --grub-splash FILE, or copy your
+   custom splash to config/binary_grub/splash.xpm.gz.
+
+   Documentation about creating a bootsplash for grub can be found at:
+   <http://ruslug.rutgers.edu/~mcgrof/grub-images/>
+
+
+Q: How can I make my own syslinux bootsplash?
+A: To add a syslinux splash screen, you can use --syslinux-splash FILE, or copy
+   your custom splash to config/binary_syslinux/splash.rle.
+
+   Documentation about creating a bootsplash for grub can be found at:
+   <http://www.sweb.cz/Frantisek.Rysanek/splash/isolinux-splash-HOWTO.html>
+   contrib/syslinux-splash/COPYING in the live-helper sources.
+
+   Basically, you need to install netpbm and syslinux, and run this:
+   anytopnm < $your_splash > $your_splash.pnm
+   pnmcolormap 15 < $your_splash.pnm > $your_splash.map
+   pnmremap -map=$your_splash.map $your_splash.pnm | \
+   	ppmtolss16 '#ffffff=7' > splash.rle
+
+
 Run Time
 --------
 
@@ -29,5 +65,6 @@ Q: What is the root password?
 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/NEWS b/doc/NEWS
index d5b9c78..94460a3 100644
--- a/doc/NEWS
+++ b/doc/NEWS
@@ -25,3 +25,6 @@ News:
     http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000836.html
 
   * 2007-03-12: Uploaded first live-helper to Debian unstable.
+
+  * 2007-04-19: Google Summer of Code 2007
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-April/001221.html
diff --git a/examples/beryl-hook.sh b/examples/beryl-hook.sh
index f1658a5..a58056d 100755
--- a/examples/beryl-hook.sh
+++ b/examples/beryl-hook.sh
@@ -6,17 +6,6 @@
 # To enable it, copy this hook into your config/chroot_localhooks directory.
 # At boot prompt, type 'live aixgl', press enter and have fun.
 
-# Update sources.list
-cat >> /etc/apt/sources.list << EOF
-# beryl-project
-deb http://debian.beryl-project.org/ etch main
-EOF
-
-if grep deb-src /etc/apt/sources.list
-then
-	echo "deb-src http://debian.beryl-project.org/ etch main" >> /etc/apt/sources.list
-fi
-
 # Import archive signing key
 wget -O - http://debian.beryl-project.org/[email-masked] | apt-key add -
 
@@ -24,7 +13,8 @@ wget -O - http://debian.beryl-project.org/[email-masked] | apt-key add -
 apt-get update
 
 # Install packages
-PACKAGES="beryl beryl-core beryl-manager beryl-plugins beryl-plugins-unsupported beryl-settings beryl-settings-bindings beryl-settings-simple"
+PACKAGES="beryl beryl-core beryl-manager beryl-plugins beryl-settings beryl-settings-bindings beryl-settings-simple"
+#beryl-plugins-unsupported
 
 if [ -f /usr/bin/gnome-session ]
 then
diff --git a/examples/beryl.sources.list b/examples/beryl.sources.list
new file mode 100644
index 0000000..8295230
--- /dev/null
+++ b/examples/beryl.sources.list
@@ -0,0 +1,14 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Beryl Etch repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. beryl.build and once as beryl.image.
+## Additionally, you need to copy the beryl-hook.sh file to your
+## config/chroot_localhooks directory.
+##
+## Remeber to also import http://debian.beryl-project.org/[email-masked]
+## into your trusted keyring.
+
+# Beryl packages for Etch
+deb http://debian.beryl-project.org/ etch main
+deb-src http://debian.beryl-project.org/ etch main
diff --git a/examples/daily-cron.sh b/examples/daily-cron.sh
new file mode 100755
index 0000000..49156c5
--- /dev/null
+++ b/examples/daily-cron.sh
@@ -0,0 +1,136 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="daily"
+
+AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`"
+AUTOBUILD_DISTRIBUTIONS="sid"
+AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+AUTOBUILD_OPTIONS="--apt-recommends disabled"
+
+AUTOBUILD_DATE="`date +%Y%m%d`"
+AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+AUTOBUILD_TEMPDIR="/srv/tmp"
+
+AUTOBUILD_MIRROR="http://ftp.de.debian.org/debian/"
+AUTOBUILD_MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/"
+
+# Check for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Check for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Check for autobuild
+#if [ "${AUTOBUILD}" != "enabled" ]
+#then
+#	exit 0
+#fi
+
+# Check for build directory
+if [ ! -d "${AUTOBUILD_TEMPDIR}" ]
+then
+	mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES}
+do
+	for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS}
+		do
+			if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ]
+		then
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+		fi
+
+		if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
+		then
+			# Workaround of missing multi-binary support in live-helper
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
+			rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_*
+			mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
+			cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+		fi
+
+		# Cleanup
+		cd "${AUTOBUILD_TEMPDIR}"/debian-live
+		lh_clean
+		done
+	done
+done
+
+# Cleanup
+if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys
+fi
+
+rm -rf "${AUTOBUILD_TEMPDIR}"
+
+# md5sums
+for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Current symlink
+rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
diff --git a/examples/edu.sources.list b/examples/edu.sources.list
new file mode 100644
index 0000000..79acacd
--- /dev/null
+++ b/examples/edu.sources.list
@@ -0,0 +1,11 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## Debian Edu/Skolelinux repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. edu.build and once as edu.image.
+##
+## Remeber to add debian-edu-archive-keyring to your package selection.
+
+# Debian Edu/Skolelinux
+deb http://ftp.skolelinux.org/skolelinux/ etch-test local
+deb-src http://ftp.skolelinux.org/skolelinux/ etch-test local
diff --git a/examples/etch+beryl-cron.sh b/examples/etch+beryl-cron.sh
new file mode 100755
index 0000000..69e2ba8
--- /dev/null
+++ b/examples/etch+beryl-cron.sh
@@ -0,0 +1,146 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="etch+beryl"
+
+AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`"
+AUTOBUILD_DISTRIBUTIONS="etch"
+AUTOBUILD_PACKAGES_LISTS="gnome-desktop kde-desktop xfce-desktop"
+AUTOBUILD_OPTIONS="--apt-recommends disabled"
+
+AUTOBUILD_DATE="r0_1.0~a7-1"
+AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+AUTOBUILD_TEMPDIR="/srv/tmp"
+
+AUTOBUILD_MIRROR="http://ftp.de.debian.org/debian/"
+AUTOBUILD_MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/"
+
+# Check for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Check for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Check for autobuild
+#if [ "${AUTOBUILD}" != "enabled" ]
+#then
+#	exit 0
+#fi
+
+# Check for build directory
+if [ ! -d "${AUTOBUILD_TEMPDIR}" ]
+then
+	mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES}
+do
+	for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS}
+		do
+			if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ]
+		then
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+
+			# Beryl hook
+			mkdir -p debian-live/config/chroot_localhooks
+			cp /usr/share/live-helper/examples/beryl-hook.sh debian-live/config/chroot_localhooks/beryl.sh
+			mkdir -p debian-live/config/chroot_sources
+			wget http://debian.beryl-project.org/[email-masked] -O debian-live/config/chroot_sources/beryl.build.gpg
+			wget http://debian.beryl-project.org/[email-masked] -O debian-live/config/chroot_sources/beryl.image.gpg
+			cp /usr/share/live-helper/examples/beryl.sources.list debian-live/config/chroot_sources/beryl.build
+			cp /usr/share/live-helper/examples/beryl.sources.list debian-live/config/chroot_sources/beryl.image
+
+			make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar
+		fi
+
+		if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
+		then
+			# Workaround of missing multi-binary support in live-helper
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
+			rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_*
+			mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
+			cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.img
+		fi
+
+		# Cleanup
+		cd "${AUTOBUILD_TEMPDIR}"/debian-live
+		lh_clean
+		done
+	done
+done
+
+# Cleanup
+if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys
+fi
+
+rm -rf "${AUTOBUILD_TEMPDIR}"
+
+# md5sums
+for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Current symlink
+rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
diff --git a/examples/etch-cron.sh b/examples/etch-cron.sh
new file mode 100755
index 0000000..d5ec6e7
--- /dev/null
+++ b/examples/etch-cron.sh
@@ -0,0 +1,136 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="etch"
+
+AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`"
+AUTOBUILD_DISTRIBUTIONS="etch"
+AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+AUTOBUILD_OPTIONS="--apt-recommends disabled"
+
+AUTOBUILD_DATE="r0_1.0~a7-1"
+AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+AUTOBUILD_TEMPDIR="/srv/tmp"
+
+AUTOBUILD_MIRROR="http://ftp.de.debian.org/debian/"
+AUTOBUILD_MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/"
+
+# Check for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Check for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Check for autobuild
+#if [ "${AUTOBUILD}" != "enabled" ]
+#then
+#	exit 0
+#fi
+
+# Check for build directory
+if [ ! -d "${AUTOBUILD_TEMPDIR}" ]
+then
+	mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES}
+do
+	for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS}
+		do
+			if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ]
+		then
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+		fi
+
+		if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
+		then
+			# Workaround of missing multi-binary support in live-helper
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
+			rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_*
+			mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
+			cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+		fi
+
+		# Cleanup
+		cd "${AUTOBUILD_TEMPDIR}"/debian-live
+		lh_clean
+		done
+	done
+done
+
+# Cleanup
+if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys
+fi
+
+rm -rf "${AUTOBUILD_TEMPDIR}"
+
+# md5sums
+for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Current symlink
+rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
diff --git a/examples/fai.sources.list b/examples/fai.sources.list
new file mode 100644
index 0000000..2c6e80f
--- /dev/null
+++ b/examples/fai.sources.list
@@ -0,0 +1,9 @@
+## This is a sources.list for live-helper(7) to use packages from the
+## FAI - Fully Automated Install repository.
+##
+## To enable it, copy this file to your config/chroot_sources directory, once
+## as e.g. fai.build and once as fai.image.
+
+# FAI - Fully Automated Install
+deb http://www.informatik.uni-koeln.de/fai/download/ etch koeln
+deb-src http://www.informatik.uni-koeln.de/fai/download/ etch koeln
diff --git a/examples/weekly-cron.sh b/examples/weekly-cron.sh
new file mode 100755
index 0000000..18780eb
--- /dev/null
+++ b/examples/weekly-cron.sh
@@ -0,0 +1,136 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="weekly"
+
+AUTOBUILD_ARCHITECTURES="`dpkg --print-architecture`"
+AUTOBUILD_DISTRIBUTIONS="lenny"
+AUTOBUILD_PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+AUTOBUILD_OPTIONS="--apt-recommends disabled"
+
+AUTOBUILD_DATE="`date +%Y%m%d`"
+AUTOBUILD_DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+AUTOBUILD_TEMPDIR="/srv/tmp"
+
+AUTOBUILD_MIRROR="http://ftp.de.debian.org/debian/"
+AUTOBUILD_MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/"
+
+# Check for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Check for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Check for autobuild
+#if [ "${AUTOBUILD}" != "enabled" ]
+#then
+#	exit 0
+#fi
+
+# Check for build directory
+if [ ! -d "${AUTOBUILD_TEMPDIR}" ]
+then
+	mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${AUTOBUILD_TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${AUTOBUILD_ARCHITECTURES}
+do
+	for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${AUTOBUILD_PACKAGES_LISTS}
+		do
+			if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt ]
+		then
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source enabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso ] && [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-log.txt
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.iso "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+		fi
+
+		if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
+		then
+			# Workaround of missing multi-binary support in live-helper
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
+			rm -rf "${AUTOBUILD_TEMPDIR}"/debian-live/binary* "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_*
+			mkdir "${AUTOBUILD_TEMPDIR}"/debian-live/binary
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_chroot
+			touch "${AUTOBUILD_TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+			# Generating images
+			mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
+			cd "${AUTOBUILD_TEMPDIR}"
+			make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+		fi
+
+		if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
+		then
+			# Moving logs
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
+			cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
+
+			# Moving images
+			mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
+			mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+		fi
+
+		# Cleanup
+		cd "${AUTOBUILD_TEMPDIR}"/debian-live
+		lh_clean
+		done
+	done
+done
+
+# Cleanup
+if [ -e "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${AUTOBUILD_TEMPDIR}"/debian-live/chroot/sys
+fi
+
+rm -rf "${AUTOBUILD_TEMPDIR}"
+
+# md5sums
+for DIRECTORY in "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Current symlink
+rm -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/current
diff --git a/functions/arguments.sh b/functions/arguments.sh
index 8405dcb..0bb6441 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -11,7 +11,7 @@ set -e
 
 Arguments ()
 {
-	ARGUMENTS="`getopt --longoptions breakpoints,conffile:,debug,force,help,logfile:,quiet,usage,verbose,version --name=${PROGRAM} --options huv --shell sh -- "${@}"`"
+	ARGUMENTS="`getopt --longoptions breakpoints,conffile:,debug,force,help,logfile:,trace,root-command:,quiet,usage,verbose,version --name=${PROGRAM} --options huv --shell sh -- "${@}"`"
 
 	if [ "${?}" != "0" ]
 	then
@@ -48,6 +48,14 @@ Arguments ()
 				LH_LOGFILE="${2}"; shift 2
 				;;
 
+			--trace)
+				LH_TRACE="enabled"; shift
+				;;
+
+			--root-command)
+				LH_ROOT_COMMAND="${2}"; shift
+				;;
+
 			--quiet)
 				LH_QUIET="enabled"; shift
 				;;
diff --git a/functions/breakpoints.sh b/functions/breakpoints.sh
index 70e4738..09b41e8 100755
--- a/functions/breakpoints.sh
+++ b/functions/breakpoints.sh
@@ -9,11 +9,11 @@
 
 Breakpoint ()
 {
+	NAME="${1}"
+
 	if [ "${LH_BREAKPOINTS}" = "enabled" ]
 	then
-		BREAKPOINT="${1}"
-
-		Echo_message "Waiting at ${BREAKPOINT}"
+		Echo_message "Waiting at ${NAME}"
 		read
 	fi
 }
diff --git a/functions/chroot.sh b/functions/chroot.sh
index c463f66..77232a1 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_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" ${COMMANDS}
+	${LH_ROOT_COMMAND} 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 a6e475f..a568638 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
 set -e
 
 PROGRAM="`basename ${0}`"
-VERSION="1.0~a6"
+VERSION="1.0~a7"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 5deaa54..4333608 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -170,6 +170,12 @@ Set_defaults ()
 		fi
 	fi
 
+	# Setting tasksel
+	if [ -z "${LH_TASKSEL}" ]
+	then
+		LH_TASKSEL="aptitude"
+	fi
+
 	# Setting root directory
 	if [ -z "${LIVE_ROOT}" ]
 	then
@@ -210,6 +216,12 @@ Set_defaults ()
 		LH_VERBOSE="disabled"
 	fi
 
+	# If we are root, disable root command
+	if [ "`id -u`" = "0" ]
+	then
+		LIVE_ROOT_COMMAND=""
+	fi
+
 	## config/bootstrap
 
 	# Setting architecture value
@@ -305,7 +317,15 @@ Set_defaults ()
 	# Setting sections value
 	if [ -z "${LIVE_SECTIONS}" ]
 	then
-		LIVE_SECTIONS="main"
+		case "${LH_MODE}" in
+			debian)
+				LIVE_SECTIONS="main"
+				;;
+
+			ubuntu)
+				LIVE_SECTIONS="main restricted"
+				;;
+		esac
 	fi
 
 	## config/chroot
diff --git a/functions/echo.sh b/functions/echo.sh
index 71800ad..f28879c 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -11,34 +11,44 @@ set -e
 
 Echo_debug ()
 {
+	STRING="${1}"
+
 	if [ "${LH_DEBUG}" = "enabled" ]
 	then
-		echo "D: ${@}"
+		echo "D: ${STRING}"
 	fi
 }
 
 Echo_error ()
 {
-	echo "E: ${@}"
+	STRING="${1}"
+
+	echo "E: ${STRING}"
 }
 
 Echo_message ()
 {
+	STRING="${1}"
+
 	if [ "${LH_QUIET}" != "enabled" ]
 	then
-		echo "P: ${@}"
+		echo "P: ${STRING}"
 	fi
 }
 
 Echo_verbose ()
 {
+	STRING="${1}"
+
 	if [ "${LH_VERBOSE}" = "enabled" ]
 	then
-		echo "I: ${@}"
+		echo "I: ${STRING}"
 	fi
 }
 
 Echo_warning ()
 {
-	echo "W: ${@}"
+	STRING="${1}"
+
+	echo "W: ${STRING}"
 }
diff --git a/functions/exit.sh b/functions/exit.sh
index ff76c36..3de897c 100755
--- a/functions/exit.sh
+++ b/functions/exit.sh
@@ -13,6 +13,7 @@ Exit ()
 {
 	if [ "${LH_DEBUG}" = "enabled" ]
 	then
+		# Dump variables
 		set | grep -e ^LH -e ^LIVE
 	fi
 
diff --git a/functions/package.sh b/functions/package.sh
new file mode 100755
index 0000000..3d11873
--- /dev/null
+++ b/functions/package.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# packages.sh - handle packages installation
+# Copyright (C) 2006-2007 Daniel Baumann <[email-masked]>
+#
+# 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
+
+Check_package ()
+{
+	FILE="${1}"
+	PACKAGE="${2}"
+
+	if [ ! -f "${FILE}" ]
+	then
+		PACKAGES="${PACKAGES} ${PACKAGE}"
+	fi
+}
+
+Install_package ()
+{
+	if [ -n "${PACKAGES}" ]
+	then
+		case "${LH_APT}" in
+			apt|apt-get)
+				Chroot "apt-get install --yes ${PACKAGES}"
+				;;
+
+			aptitude)
+				Chroot "aptitude install --assume-yes ${PACKAGES}"
+				;;
+		esac
+	fi
+}
+
+Remove_package ()
+{
+	if [ -n "${PACKAGES}" ]
+	then
+		case "${LH_APT}" in
+			apt|apt-get)
+				Chroot "apt-get remove --purge --yes ${PACKAGES}"
+				;;
+
+			aptitude)
+				Chroot "aptitude purge --assume-yes ${PACKAGES}"
+				;;
+		esac
+	fi
+}
diff --git a/functions/stagefile.sh b/functions/stagefile.sh
index 6a41cda..a570ea2 100755
--- a/functions/stagefile.sh
+++ b/functions/stagefile.sh
@@ -17,14 +17,15 @@ Check_stagefile ()
 	# Checking stage file
 	if [ -f "${FILE}" ]
 	then
-		if [ "${LH_FORCE}" = "enabled" ]
+		if [ "${LH_FORCE}" != "enabled" ]
 		then
-			# Forcing execution
-			rm -f "${FILE}"
-		else
 			# Skipping execution
 			Echo_warning "skipping ${NAME}"
 			exit 0
+		else
+			# Forcing execution
+			Echo_message "forcing ${NAME}"
+			rm -f "${FILE}"
 		fi
 	fi
 }
diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index 24ee5f8..58835ad 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -45,25 +45,30 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-# Normally, proc is not mounted here, but people tend to be lazy
+# Normally, virtual filesystems are not mounted here, but people tend to be lazy
 if [ -f chroot/proc/version ]
 then
-	umount chroot/proc
+	${LH_ROOT_COMMAND} umount chroot/proc
 fi
 
 if [ -d chroot/sys/kernel ]
 then
-	umount chroot/sys
+	${LH_ROOT_COMMAND} umount chroot/sys
 fi
 
 # Removing old chroot
-rm -rf chroot/chroot
-rm -rf chroot.tmp
+${LH_ROOT_COMMAND} rm -rf chroot/chroot
+${LH_ROOT_COMMAND} 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
+${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
+${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
+
+if [ -n "${LH_ROOT_COMMAND}" ]
+then
+	${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+fi
 
 # Creating stage file
 Create_stagefile .stage/binary_chroot
diff --git a/helpers/lh_binary_encryption b/helpers/lh_binary_encryption
index c10ba9a..d660b52 100755
--- a/helpers/lh_binary_encryption
+++ b/helpers/lh_binary_encryption
@@ -66,24 +66,11 @@ case "${LIVE_FILESYSTEM}" in
 		;;
 esac
 
-if [ ! -f chroot/usr/bin/aespipe ]
-then
-	PACKAGES="${PACKAGES} aespipe"
-fi
+# Checking depends
+Check_package chroot/usr/bin/aespipe aespipe
 
-if [ -n "${PACKAGES}" ]
-then
-	# Installing packages
-	case "${LH_APT}" in
-		apt|apt-get)
-			Chroot "apt-get install --yes ${PACKAGES}"
-			;;
-
-		aptitude)
-			Chroot "aptitude install --assume-yes ${PACKAGES}"
-			;;
-	esac
-fi
+# Installing depends
+Install_package
 
 # Moving image
 mv binary/casper/filesystem.${LIVE_FILESYSTEM} chroot
@@ -113,18 +100,8 @@ Chroot "sh encrypt"
 mv chroot/filesystem.${LIVE_FILESYSTEM} binary/casper
 rm -f chroot/encrypt
 
-# Removing packages
-if [ -n "${PACKAGES}" ]
-then
-	case "${LH_APT}" in
-		apt|apt-get)
-			Chroot "apt-get remove --purge --yes ${PACKAGES}"
-			;;
-			aptitude)
-			Chroot "aptitude purge --assume-yes ${PACKAGES}"
-			;;
-	esac
-fi
+# Removing depends
+Remove_package
 
 # Creating stage file
 Create_stagefile .stage/binary_encryption
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 3b652af..894815e 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -68,24 +68,11 @@ then
 	fi
 fi
 
-if [ ! -f chroot/usr/sbin/grub ]
-then
-	PACKAGES="${PACKAGES} grub"
-fi
-
-if [ -n "${PACKAGES}" ]
-then
-	# Installing symlinks
-	case "${LH_APT}" in
-		apt|apt-get)
-			Chroot "apt-get install --yes ${PACKAGES}"
-		;;
+# Checking depends
+Check_package chroot/usr/sbin/grub grub
 
-		aptitude)
-			Chroot "aptitude install --assume-yes ${PACKAGES}"
-			;;
-	esac
-fi
+# Installing depends
+Install_package
 
 # Setting destination directory
 case "${LIVE_BINARY_IMAGE}" in
@@ -176,15 +163,20 @@ 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
+		cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
 		;;
 
 	usb|hdd)
-		cp chroot/usr/lib/grub/i386-pc/stage1 chroot/usr/lib/grub/i386-pc/stage2 binary/boot/grub
+		cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/stage2 binary/boot/grub
 		;;
 esac
 
 # Copying splash screen
+if [ -f config/binary_grub/splash.xpm.gz ]
+then
+	LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
+fi
+
 if [ -n "${LIVE_GRUB_SPLASH}" ]
 then
 	if [ "${LIVE_GRUB_SPLASH}" = "none" ]
@@ -213,19 +205,8 @@ EOF
 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}" ]
-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
+# Removing depends
+Remove_package
 
 # Creating stage file
 Create_stagefile .stage/binary_grub
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 63156aa..b22b3b4 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -49,24 +49,11 @@ do
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ ! -f chroot/usr/bin/"${LH_GENISOIMAGE}" ]
-		then
-			PACKAGES="${PACKAGES} ${LH_GENISOIMAGE}"
-		fi
+		# Checking depends
+		Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
 
-		if [ -n "${PACKAGES}" ]
-		then
-			# Installing packages
-			case "${LH_APT}" in
-				apt|apt-get)
-					Chroot "apt-get install --yes ${PACKAGES}"
-					;;
-
-				aptitude)
-					Chroot "aptitude install --assume-yes ${PACKAGES}"
-					;;
-			esac
-		fi
+		# Installing depends
+		Install_package
 
 		# Remove old iso image
 		if [ -f binary.iso ]
@@ -74,6 +61,11 @@ do
 			rm -f binary.iso
 		fi
 
+		if [ "${LH_VERBOSE}" = "enabled" ]
+		then
+			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -i"
+		fi
+
 		# Moving image
 		mv binary chroot
 
@@ -82,37 +74,26 @@ do
 		then
 			case "${LIVE_BOOTLOADER}" in
 				grub)
-					Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b boot/grub/stage2_eltorito -m boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+					Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -b boot/grub/stage2_eltorito -m boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
 					;;
 
 				syslinux)
 					#Chroot "${LH_GENISOIMAGE} -A \"Debian Live\" -p \"Debian Live; http://debian-live.alioth.debian.org/; [email-masked]\" -publisher \"Debian Live; http://debian-live.alioth.debian.org/; [email-masked]\" -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
-					Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+					Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
 					;;
 			esac
 		else
 			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/; [email-masked]' -publisher 'Debian Live; http://debian-live.alioth.debian.org/; [email-masked]' -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" binary"
-			Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l binary"
+			Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE} -o binary.iso -r -J -l binary"
 		fi
 
 		# Move image
 		mv chroot/binary chroot/binary.iso ./
 
-		# Removing packages
-		if [ -n "${PACKAGES}" ]
-		then
-			case "${LH_APT}" in
-				apt|apt-get)
-					Chroot "apt-get remove --purge --yes ${PACKAGES}"
-					;;
-
-				aptitude)
-					Chroot "aptitude purge --assume-yes ${PACKAGES}"
-					;;
-			esac
-		fi
+		# Removing depends
+		Remove_package
 
 		# Creating stage file
 		Create_stagefile .stage/binary_iso
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index 48c8001..ea07422 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -56,35 +56,19 @@ then
 	exit 0
 fi
 
+# Checking depends
 case "${LIVE_MEMTEST}" in
 	memtest86)
-		if [ ! -f chroot/boot/memtest86.bin ]
-		then
-			PACKAGES="${PACKAGES} memtest86"
-		fi
+		Check_package chroot/boot/memtest86.bin memtest86
 		;;
 
 	memtest86+)
-		if [ ! -f chroot/boot/memtest86+.bin ]
-		then
-			PACKAGES="${PACKAGES} memtest86+"
-		fi
+		Check_package chroot/boot/memtest86+.bin memtest86+
 		;;
 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
+# Installing depends
+Install_package
 
 # Setting destination directory
 case "${LIVE_BINARY_IMAGE}" in
@@ -132,19 +116,8 @@ case "${LIVE_MEMTEST}" in
 		;;
 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
+# Removing depends
+Remove_package
 
 # Creating stage file
 Create_stagefile .stage/binary_memtest
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index daacaea..12ac0bb 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -54,24 +54,11 @@ fi
 
 case "${LIVE_FILESYSTEM}" in
 	ext2)
-		if [ ! -f chroot/usr/bin/genext2fs ]
-		then
-			PACKAGES="${PACKAGES} genext2fs"
-		fi
+		# Checking depends
+		Check_package chroot/usr/bin/genext2fs genext2fs
 
-		if [ -n "${PACKAGES}" ]
-		then
-			# Installing packages
-			case "${LH_APT}" in
-				apt|apt-get)
-					Chroot "apt-get install --yes ${PACKAGES}"
-					;;
-
-				aptitude)
-					Chroot "aptitude install --assume-yes ${PACKAGES}"
-					;;
-			esac
-		fi
+		# Installing depends
+		Install_package
 
 		# Remove old ext2 image
 		if [ -f binary/casper/filesystem.ext2 ]
@@ -88,19 +75,8 @@ case "${LIVE_FILESYSTEM}" in
 		mv chroot/filesystem.ext2 binary/casper
 		rm -rf chroot/chroot
 
-		# Removing packages
-		if [ -n "${PACKAGES}" ]
-		then
-			case "${LH_APT}" in
-				apt|apt-get)
-					Chroot "apt-get remove --purge --yes ${PACKAGES}"
-					;;
-
-				aptitude)
-					Chroot "aptitude purge --assume-yes ${PACKAGES}"
-					;;
-			esac
-		fi
+		# Removing depends
+		Remove_package
 		;;
 
 	plain)
@@ -113,56 +89,47 @@ case "${LIVE_FILESYSTEM}" in
 		;;
 
 	squashfs)
-		if [ ! -f chroot/usr/sbin/mksquashfs ]
+		# Checking depends
+		Check_package chroot/usr/sbin/mksquashfs squashfs-tools
+
+		# Installing depends
+		Install_package
+
+		# Remove old squashfs image
+		if [ -f binary/casper/filesystem.squashfs ]
 		then
-			PACKAGES="${PACKAGES} squashfs-tools"
+			rm -f binary/casper/filesystem.squashfs
 		fi
 
-		if [ -n "${PACKAGES}" ]
+		if [ "${LH_QUIET}" = "enabled" ]
 		then
-			# Installing packages
-			case "${LH_APT}" in
-				apt|apt-get)
-					Chroot "apt-get install --yes ${PACKAGES}"
-					;;
-
-				aptitude)
-					Chroot "aptitude install --assume-yes ${PACKAGES}"
-					;;
-			esac
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
 		fi
 
-		# Remove old squashfs image
-		if [ -f binary/casper/filesystem.squashfs ]
+		if [ "${LH_VERBOSE}" = "enabled" ]
 		then
-			rm -f binary/casper/filesystem.squashfs
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -i"
 		fi
 
 		# Create image
 		if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
 		then
-			Chroot "mksquashfs chroot filesystem.squashfs"
+			Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs"
 		else
-			Chroot "mksquashfs chroot filesystem.squashfs -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
+			Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
 		fi
 
 		# Move image
-		mv chroot/filesystem.squashfs binary/casper
-		rm -rf chroot/chroot
+		${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/casper
+		${LH_ROOT_COMMAND} rm -rf chroot/chroot
 
-		# Removing packages
-		if [ -n "${PACKAGES}" ]
+		if [ -n "${LH_ROOT_COMMAND}" ]
 		then
-			case "${LH_APT}" in
-				apt|apt-get)
-					Chroot "apt-get remove --purge --yes ${PACKAGES}"
-					;;
-
-				aptitude)
-					Chroot "aptitude purge --assume-yes ${PACKAGES}"
-					;;
-			esac
+			${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` binary/casper
 		fi
+
+		# Removing depends
+		Remove_package
 		;;
 esac
 
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index dff16f4..6864f32 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -56,7 +56,7 @@ then
 	exit 0
 fi
 
-# Check templates
+# Checking templates
 if [ ! -d "${LIVE_TEMPLATES}" ]
 then
 	if [ -d ../"${LIVE_TEMPLATES}" ]
@@ -68,24 +68,11 @@ then
 	fi
 fi
 
-if [ ! -f chroot/usr/bin/syslinux ]
-then
-	PACKAGES="${PACKAGES} syslinux"
-fi
+# Checking depends
+Check_package chroot/usr/bin/syslinux syslinux
 
-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
+# Installing depends
+Install_package
 
 # Setting destination directory
 case "${LIVE_BINARY_IMAGE}" in
@@ -147,12 +134,12 @@ FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
 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}"
+	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}\n\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}"
+	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}\n\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" ]
@@ -163,25 +150,26 @@ then
 		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}"
+				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}\n\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}\n\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
-			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}"
+				LINUX="${LINUX}\n\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}\n\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="${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}"
+				LINUX="${LINUX}\n\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}\n\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
 		fi
 	done
 fi
 
+# Removing '//'
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
 # Assembling memtest configuration
@@ -204,6 +192,11 @@ case "${LIVE_BINARY_IMAGE}" in
 		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
 
 		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
 		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
 		then
 			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
@@ -233,12 +226,12 @@ case "${LIVE_BINARY_IMAGE}" in
 
 				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
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" 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
+			sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/isolinux/isolinux.cfg
 		fi
 		;;
 
@@ -253,6 +246,11 @@ case "${LIVE_BINARY_IMAGE}" in
 		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/isolinux.txt
 
 		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
 		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
 		then
 			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
@@ -282,12 +280,12 @@ case "${LIVE_BINARY_IMAGE}" in
 
 				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
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" 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/" tftpboot/pxelinux.cfg/default
+			sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/isolinux/isolinux.cfg
 		fi
 		;;
 
@@ -301,6 +299,11 @@ case "${LIVE_BINARY_IMAGE}" in
 		sed -i -e "s/isolinux.txt/syslinux.txt/" binary/syslinux.cfg
 
 		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
 		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
 		then
 			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
@@ -330,29 +333,18 @@ case "${LIVE_BINARY_IMAGE}" in
 
 				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
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" 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
+			sed -i -e "s/vmlinuz-.*-${LIVE_KERNEL_FLAVOUR}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_KERNEL_FLAVOUR}/initrd.img/g" binary/syslinux.cfg
 		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
+# Removing depends
+Remove_package
 
 # Creating stage file
 Create_stagefile .stage/binary_syslinux
diff --git a/helpers/lh_binary_usb b/helpers/lh_binary_usb
index 291f877..e0c0193 100755
--- a/helpers/lh_binary_usb
+++ b/helpers/lh_binary_usb
@@ -50,50 +50,23 @@ do
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ ! -f chroot/sbin/mkdosfs ]
-		then
-			PACKAGES="${PACKAGES} dosfstools"
-		fi
-
-		if [ ! -f chroot/usr/bin/mtools ]
-		then
-			PACKAGES="${PACKAGES} mtools"
-		fi
-
-		if [ ! -f chroot/sbin/parted ]
-		then
-			PACKAGES="${PACKAGES} parted"
-		fi
+		# Checking depends
+		Check_package chroot/sbin/mkdosfs dosfstools
+		Check_package chroot/usr/sbin/mtools mtools
+		Check_package chroot/sbin/parted parted
 
 		case "${LIVE_BOOTLOADER}" in
 			grub)
-				if [ ! -f chroot/usr/sbin/grub ]
-				then
-					PACKAGES="${PACKAGES} grub"
-				fi
+				Check_package chroot/usr/sbin/grub grub
 				;;
 
 			syslinux)
-				if [ ! -f chroot/usr/bin/syslinux ]
-				then
-					PACKAGES="${PACKAGES} syslinux"
-				fi
+				Check_package chroot/usr/bin/syslinux syslinux
 				;;
 		esac
 
-		if [ -n "${PACKAGES}" ]
-		then
-			# Installing packages
-			case "${LH_APT}" in
-				apt|apt-get)
-					Chroot "apt-get install --yes ${PACKAGES}"
-					;;
-
-				aptitude)
-					Chroot "aptitude install --assume-yes ${PACKAGES}"
-					;;
-			esac
-		fi
+		# Installing depends
+		Install_package
 
 		# Remove old binary
 		if [ -f binary.img ]
@@ -145,9 +118,9 @@ do
 		lh_losetup $FREELO binary.img 1
 		Chroot "mkfs.msdos -n DEBIAN_LIVE ${FREELO}"
 		mkdir -p binary.tmp
-		mount ${FREELO} binary.tmp
+		${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
 		cp -r binary/* binary.tmp
-		umount binary.tmp
+		${LH_ROOT_COMMAND} umount binary.tmp
 		rmdir binary.tmp
 
 		if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
@@ -175,19 +148,8 @@ do
 			mv chroot/dev.tmp chroot/dev
 		fi
 
-		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
+		# Removing depends
+		Remove_package
 
 		# Creating stage file
 		Create_stagefile .stage/binary_usb
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index f891927..e4a1b65 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -68,24 +68,11 @@ then
 	fi
 fi
 
-if [ ! -f chroot/usr/lib/yaboot/yaboot ]
-then
-	PACKAGES="${PACKAGES} yaboot"
-fi
+# Checking depends
+Check_package chroot/usr/lib/yaboot/yaboot yaboot
 
-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
+# Installing depends
+Install_package
 
 # Setting destination directory
 case "${LIVE_BINARY_IMAGE}" in
@@ -199,19 +186,8 @@ case "${LIVE_BINARY_IMAGE}" in
 		;;
 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
+# Removing depends
+Remove_package
 
 # Creating stage file
 Create_stagefile .stage/binary_yaboot
diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap
index 5453d02..7aa2ea4 100755
--- a/helpers/lh_bootstrap_cdebootstrap
+++ b/helpers/lh_bootstrap_cdebootstrap
@@ -96,7 +96,12 @@ then
 		# Restore old cache
 		if [ -d cache/chroot_bootstrap ]
 		then
-			cp -a cache/chroot_bootstrap/* chroot
+			${LH_ROOT_COMMAND} cp -a cache/chroot_bootstrap/* chroot
+
+			if [ -n "${LH_ROOT_COMMAND}" ]
+			then
+				${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+			fi
 
 			# Creating stage file
 			Create_stagefile .stage/bootstrap
@@ -111,7 +116,12 @@ then
 		fi
 
 		# Executing cdebootstrap (download-only)
-		cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}"
+		${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}"
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+		fi
 
 		# Removing old cache
 		if [ -d cache/bootstrap ]
@@ -129,7 +139,12 @@ then
 	fi
 
 	# Executing cdebootstrap (regular run)
-	cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}"
+	${LH_ROOT_COMMAND} cdebootstrap ${CDEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}"
+
+	if [ -n "${LH_ROOT_COMMAND}" ]
+	then
+		${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+	fi
 
 	# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
 	if [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "minimal" ] || [ "${LIVE_BOOTSTRAP_FLAVOUR}" = "mini" ]
@@ -156,7 +171,12 @@ then
 			rm -rf cache/chroot_bootstrap
 		fi
 
-		cp -a chroot cache/chroot_bootstrap
+		${LH_ROOT_COMMAND} cp -a chroot cache/chroot_bootstrap
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/chroot_bootstrap
+		fi
 	fi
 
 	# Creating stage file
diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap
index d7b807f..43fdd96 100755
--- a/helpers/lh_bootstrap_debootstrap
+++ b/helpers/lh_bootstrap_debootstrap
@@ -79,7 +79,12 @@ then
 		# Restore old cache
 		if [ -d cache/chroot_bootstrap ]
 		then
-			cp -a cache/chroot_bootstrap/* chroot
+			${LH_ROOT_COMMAND} cp -a cache/chroot_bootstrap/* chroot
+
+			if [ -n "${LH_ROOT_COMMAND}" ]
+			then
+				${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+			fi
 
 			# Creating stage file
 			Create_stagefile .stage/bootstrap
@@ -94,7 +99,12 @@ then
 		fi
 
 		# Executing debootstrap (download-only)
-		debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+		${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+		fi
 
 		# Removing old cache
 		if [ -d cache/bootstrap ]
@@ -112,7 +122,12 @@ then
 	fi
 
 	# Executing debootstrap (regular run)
-	debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+	${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LIVE_DISTRIBUTION}" chroot "${LIVE_MIRROR_BUILD}" "${LIVE_DEBOOTSTRAP_SCRIPT}"
+
+	if [ -n "${LH_ROOT_COMMAND}" ]
+	then
+		${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot
+	fi
 
 	# Removing bootstrap cache
 	rm -rf chroot/var/cache/apt/archives/*.deb
@@ -125,7 +140,12 @@ then
 			rm -rf cache/chroot_bootstrap
 		fi
 
-		cp -a chroot cache/chroot_bootstrap
+		${LH_ROOT_COMMAND} cp -a chroot cache/chroot_bootstrap
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/chroot_bootstrap
+		fi
 	fi
 
 	# Creating stage file
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index 670c410..ab2dd8e 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -51,12 +51,12 @@ lh_chroot_packages "${@}"
 lh_chroot_localpackages "${@}"
 lh_chroot_localpackageslists "${@}"
 lh_chroot_localization "${@}"
-lh_chroot_hacks "${@}"
 lh_chroot_localincludes "${@}"
 lh_chroot_sysvinit "${@}"
 lh_chroot_hooks "${@}"
 lh_chroot_localhooks "${@}"
 lh_chroot_symlinks "${@}"
+lh_chroot_hacks "${@}"
 lh_chroot_interactive "${@}"
 
 # Deconfiguring chroot
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index bc6b0d4..ec367fb 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -46,7 +46,7 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Removing udev mac caching rule
-rm -f chroot/etc/udev/rules.d/z25_persistent-net.rules
+Chroot "rm -f /etc/udev/rules.d/z25_persistent-net.rules"
 
 case "${LIVE_BINARY_IMAGE}" in
 	net)
@@ -82,5 +82,10 @@ esac
 # Update initramfs
 Chroot "update-initramfs -k all -t -u"
 
+if [ -n "${LH_ROOT_COMMAND}" ]
+then
+	${LH_ROOT_COMMAND} chown -R --quiet `whoami`:`whoami` chroot
+fi
+
 # Creating stage file
 Create_stagefile .stage/chroot_hacks
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index d2fac35..7963193 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -46,26 +46,29 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Processing hooks
-if [ -n "${LIVE_PACKAGES_LISTS}" ] && [ -f /usr/share/live-helper/hooks/"${LIVE_PACKAGES_LISTS}" ]
-then
-	# Copying hook
-	cp /usr/share/live-helper/hooks/"${LIVE_PACKAGES_LISTS}" chroot/root
-
-	# Making hook executable
-	if [ ! -x chroot/root/${LIVE_PACKAGES_LISTS} ]
+for HOOK in ${LIVE_PACKAGES_LISTS} ${LIVE_TASKS}
+do
+	if [ -f /usr/share/live-helper/hooks/"${HOOK}" ]
 	then
-		chmod +x chroot/root/${LIVE_PACKAGES_LISTS}
-	fi
+		# Copying hook
+		cp /usr/share/live-helper/hooks/"${HOOK}" chroot/root
 
-	# Executing hook
-	Chroot "/root/${LIVE_PACKAGES_LISTS}"
+		# Making hook executable
+		if [ ! -x chroot/root/"${HOOK}" ]
+		then
+			chmod +x chroot/root/"${HOOK}"
+		fi
 
-	# Removing hook
-	rm -f chroot/root/"${LIVE_PACKAGE_LIST}"
+		# Executing hook
+		Chroot "/root/${HOOK}"
 
-	# Creating stage file
-	Create_stagefile .stage/chroot_hooks
-fi
+		# Removing hook
+		rm -f chroot/root/"${HOOK}"
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_hooks
+	fi
+done
 
 if [ -n "${LIVE_HOOKS}" ]
 then
diff --git a/helpers/lh_chroot_localization b/helpers/lh_chroot_localization
index 4abaf2d..f81661d 100755
--- a/helpers/lh_chroot_localization
+++ b/helpers/lh_chroot_localization
@@ -635,45 +635,27 @@ then
 	do
 		case "${LOCALZATION}" in
 			iceape)
-				if [ -f chroot/usr/bin/iceape ]
-				then
-					PACKAGES="${PACKAGES} iceweasel-l10n-${ICEAPE}"
-				fi
+				Check_package chroot/usr/bin/iceape iceweasel-l10n-"${ICEAPE}"
 				;;
 
 			icedove)
-				if [ -f chroot/usr/bin/icedove ]
-				then
-					PACKAGES="${PACKAGES} icedove-locale-${ICEDOVE}"
-				fi
+				Check_package chroot/usr/bin/icedove icedove-locale-"${ICEDOVE}"
 				;;
 
 			iceweasel)
-				if [ -f chroot/usr/bin/iceweasel ]
-				then
-					PACKAGES="${PACKAGES} iceweasel-l10n-${ICEWEASEL}"
-				fi
+				Check_package chroot/usr/bin/iceweasel iceweasel-l10n-"${ICEWEASEL}"
 				;;
 
 			kde)
-				if [ -f chroot/usr/bin/kstart ]
-				then
-					PACKAGES="${PACKAGES} kde-i18n-${KDE}"
-				fi
+				Check_package chroot/usr/bin/kstart kde-i18n-"${KDE}"
 				;;
 
 			koffice)
-				if [ -f chroot/usr/bin/usr/bin/koconverter ]
-				then
-					PACKAGES="${PACKAGES} koffice-i18n-${KOFFICE}"
-				fi
+				Check_package chroot/usr/bin/usr/bin/koconverter koffice-i18n-"${KOFFICE}"
 				;;
 
 			openoffice)
-				if [ -f chroot/usr/bin/ooffice ]
-				then
-					PACKAGES="${PACKAGES} openoffice.org-l10n-${OPENOFFICE}"
-				fi
+				Check_package chroot/usr/bin/ooffice openoffice.org-l10n-"${OPENOFFICE}"
 				;;
 		esac
 	done
@@ -682,15 +664,7 @@ then
 	Restore_cache cache/chroot_localization
 
 	# Installing packages
-	case "${LH_APT}" in
-		apt|apt-get)
-			Chroot "apt-get install --yes ${PACKAGES}"
-			;;
-
-		aptitude)
-			Chroot "apt-get install --assume-yes ${PACKAGES}"
-			;;
-	esac
+	Install_package
 
 	# Saving cache
 	Save_cache cache/chroot_localization
diff --git a/helpers/lh_chroot_proc b/helpers/lh_chroot_proc
index 42a7feb..6eeec9d 100755
--- a/helpers/lh_chroot_proc
+++ b/helpers/lh_chroot_proc
@@ -57,7 +57,7 @@ case "${1}" in
 		fi
 
 		# Mounting /proc
-		mount proc-live -t proc chroot/proc
+		${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc
 
 		# Creating stage file
 		Create_stagefile .stage/chroot_proc
@@ -71,14 +71,14 @@ case "${1}" in
 		Create_lockfile .lock
 
 		# Workaround binfmt-support /proc locking
-		if [ -e chroot/proc/sys/fs/binftm_misc/status ]
+		if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
 		then
-			umount chroot/proc/sys/fs/binfmt_misc
+			${LH_ROOT_COMMAND} umount chroot/proc/sys/fs/binfmt_misc
 		fi
 
 		# Unmounting /proc
 		#fuser -km chroot/proc
-		umount chroot/proc > /dev/null 2>&1
+		${LH_ROOT_COMMAND} umount chroot/proc > /dev/null 2>&1
 
 		# Removing stage file
 		rm -f .stage/chroot_proc
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources
index c4a3a51..7d0980d 100755
--- a/helpers/lh_chroot_sources
+++ b/helpers/lh_chroot_sources
@@ -57,15 +57,28 @@ case "${1}" in
 
 		if [ "${LIVE_SECURITY}" = "enabled" ]
 		then
-			if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
-			then
-				echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+			case "${LH_MODE}" in
+				debian)
+					if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
+					then
+						echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
 
-				if [ "${LIVE_SOURCE}" = "yes" ]
-				then
-					echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-				fi
-			fi
+						if [ "${LIVE_SOURCE}" = "enabled" ]
+						then
+							echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+						fi
+					fi
+					;;
+
+				ubuntu)
+					echo "deb ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+					if [ "${LIVE_SOURCE}" = "enabled" ]
+					then
+						echo "deb-src ${LIVE_MIRROR_BUILD_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+					fi
+					;;
+			esac
 		fi
 
 		# Check local sources.list
@@ -158,15 +171,28 @@ case "${1}" in
 
 			if [ "${LIVE_SECURITY}" = "enabled" ]
 			then
-				if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ]
-				then
-					echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-
-					if [ "${LIVE_SOURCE}" = "yes" ]
-					then
-						echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
-					fi
-				fi
+				case "${LH_MODE}" in
+					debian)
+						if [ "${LIVE_DISTRIBUTION}" != "sid" ] && [ "${LIVE_DISTRIBUTION}" != "unstable" ]
+						then
+							echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+							if [ "${LIVE_SOURCE}" = "enabled" ]
+							then
+								echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}/updates ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+							fi
+						fi
+						;;
+
+					ubuntu)
+						echo "deb ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+
+						if [ "${LIVE_SOURCE}" = "enabled" ]
+						then
+							echo "deb-src ${LIVE_MIRROR_IMAGE_SECURITY} ${LIVE_DISTRIBUTION}-security ${LIVE_SECTIONS}" >> chroot/etc/apt/sources.list
+						fi
+						;;
+				esac
 			fi
 
 			# Check local sources.list
@@ -175,7 +201,7 @@ case "${1}" in
 				echo "" >> chroot/etc/apt/sources.list
 				echo "# Custom repositories" >> chroot/etc/apt/sources.list
 
-				for FILE in config/chroot_sources/*.build
+				for FILE in config/chroot_sources/*.image
 				do
 					cat ${FILE} | grep -v "^##" >> chroot/etc/apt/sources.list
 				done
diff --git a/helpers/lh_chroot_symlinks b/helpers/lh_chroot_symlinks
index e574480..2aef0df 100755
--- a/helpers/lh_chroot_symlinks
+++ b/helpers/lh_chroot_symlinks
@@ -47,41 +47,17 @@ Create_lockfile .lock
 
 if [ "${LIVE_SYMLINKS}" = "enabled" ]
 then
-	if [ -f chroot/usr/bin/symlinks ]
-	then
-		SYMLINKS="true"
-	fi
-
-	if [ -n "${SYMLINKS}" ]
-	then
-		# Installing symlinks
-		case "${LH_APT}" in
-			apt|apt-get)
-				Chroot "apt-get install --yes symlinks"
-				;;
-
-			aptitude)
-				Chroot "aptitude install --assume-yes symlinks"
-				;;
-		esac
-	fi
+	# Checking depends
+	Check_package chroot/usr/bin/symlinks symlinks
+
+	# Installing depends
+	Install_package
 
 	# Converting symlinks
 	Chroot "symlinks -c -r -s /"
 
-	if [ -n "${SYMLINKS}" ]
-	then
-		# Removing symlinks
-		case "${LH_APT}" in
-			apt|apt-get)
-				Chroot "apt-get remove --purge --yes symlinks"
-				;;
-
-			aptitude)
-				Chroot "aptitude purge --assume-yes symlinks"
-				;;
-		esac
-	fi
+	# Removing depends
+	Remove_package
 
 	# Creating stage file
 	Create_stagefile .stage/chroot_symlinks
diff --git a/helpers/lh_chroot_sysfs b/helpers/lh_chroot_sysfs
index 539a793..5cf50c3 100755
--- a/helpers/lh_chroot_sysfs
+++ b/helpers/lh_chroot_sysfs
@@ -57,7 +57,7 @@ case "${1}" in
 		fi
 
 		# Mounting /sys
-		mount sysfs-live -t sysfs chroot/sys
+		${LH_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
 
 		# Creating stage file
 		Create_stagefile .stage/chroot_sysfs
@@ -72,7 +72,7 @@ case "${1}" in
 
 		# Unmounting /sys
 		#fuser -km chroot/sys
-		umount chroot/sys > /dev/null 2>&1
+		${LH_ROOT_COMMAND} umount chroot/sys > /dev/null 2>&1
 
 		# Removing stage file
 		rm -f .stage/chroot_sysfs
diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks
index 7427e97..64cd47f 100755
--- a/helpers/lh_chroot_tasks
+++ b/helpers/lh_chroot_tasks
@@ -50,48 +50,36 @@ then
 	# Restoring cache
 	Restore_cache cache/chroot_tasks
 
-	if [ ! -f chroot/usr/bin/aptitude ]
-	then
-		PACKAGES="${PACKAGES} aptitude"
-	fi
-
-	if [ ! -f chroot/usr/bin/tasksel ]
-	then
-		PACKAGES="${PACKAGES} tasksel"
-	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
-
-	for TASK in ${LIVE_TASKS}
-	do
-		Chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}"
-	done
-
-	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
+	# Checking depends
+	case "${LH_TASKSEL}" in
+		aptitude)
+			Check_package chroot/usr/bin/aptitude aptitude
+			;;
+
+		tasksel)
+			Check_package chroot/usr/bin/tasksel tasksel
+			;;
+	esac
+
+	# Installing depends
+	Install_package
+
+	# Installing tasks
+	case "${LH_TASKSEL}" in
+		aptitude)
+			Chroot "aptitude install --assume-yes ${LIVE_TASKS}"
+			;;
+
+		tasksel)
+			for TASK in ${LIVE_TASKS}
+			do
+				Chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}"
+			done
+			;;
+	esac
+
+	# Removing depends
+	Remove_package
 
 	# Saving cache
 	Save_cache cache/chroot_tasks
diff --git a/helpers/lh_clean b/helpers/lh_clean
index 10118f5..24a65e3 100755
--- a/helpers/lh_clean
+++ b/helpers/lh_clean
@@ -47,22 +47,22 @@ case "${1}" in
 		;;
 
 	cache)
-		rm -rf cache
+		${LH_ROOT_COMMAND} rm -rf cache
 		;;
 
 	chroot)
-		umount -f chroot/sys > /dev/null 2>&1 || true
-		umount -f chroot/proc > /dev/null 2>&1 || true
-		umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
-		umount -f chroot/dev/shm > /dev/null 2>&1 || true
-		umount -f chroot/dev/pts > /dev/null 2>&1 || true
-		umount -f chroot/dev > /dev/null 2>&1 || true
+		${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
+		${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
+		${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
+		${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
+		${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
+		${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
 
-		rm -rf chroot chroot.tmp
+		${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
 
 		if [ "${PURGE}" != "true" ] && [ -d cache/chroot_bootstrap ]
 		then
-			cp -a cache/chroot_bootstrap chroot
+			${LH_ROOT_COMMAND} cp -a cache/chroot_bootstrap chroot
 			mkdir -p .stage
 			touch .stage/bootstrap
 		fi
diff --git a/helpers/lh_config b/helpers/lh_config
index 13c1835..4f3e844 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -121,12 +121,20 @@ LH_GENISOIMAGE="${LH_GENISOIMAGE}"
 # (Default: autodetected)
 LH_LOSETUP="${LH_LOSETUP}"
 
+# \$LH_TASKSEL: set the tasksel program
+# (Default: ${LH_TASKSEL})
+LH_TASKSEL="${LH_TASKSEL}"
+
 # \$LIVE_ROOT: set the root directory
 # (Default: ${LIVE_ROOT})
 LIVE_ROOT="${LIVE_ROOT}"
 
 # Live-helper options
 
+# \$LH_ROOT_COMMAND: use sudo or equivalent
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
+
 # \$LH_BREAKPOINTS: enable breakpoints
 # (Default: ${LH_BREAKPOINTS})
 LH_BREAKPOINTS="${LH_BREAKPOINTS}"
@@ -323,4 +331,6 @@ LIVE_TEMPLATES="${LIVE_TEMPLATES}"
 EOF
 
 # Creating lh_binary_* directories
+mkdir -p "${LIVE_ROOT}"/config/binary_grub
 mkdir -p "${LIVE_ROOT}"/config/binary_localincludes
+mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
diff --git a/helpers/lh_losetup b/helpers/lh_losetup
index e3b7148..47c8f34 100755
--- a/helpers/lh_losetup
+++ b/helpers/lh_losetup
@@ -35,7 +35,7 @@ Breakpoint "losetup: Init"
 
 if [ -z "${1}" ]
 then
-	DEVICE="`${LH_LOSETUP} -f`"
+	DEVICE="`${LH_ROOT_COMMAND} ${LH_LOSETUP} -f`"
 else
 	DEVICE="${1}"
 fi
@@ -43,9 +43,9 @@ fi
 FILE="${2}"
 PARTITION="${3}"
 
-${LH_LOSETUP} "${DEVICE}" "${FILE}"
+${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
 FDISK_OUT="`fdisk -l -u ${DEVICE} 2>&1`"
-${LH_LOSETUP} -d "${DEVICE}"
+${LH_ROOT_COMMAND} ${LH_LOSETUP} -d "${DEVICE}"
 
 LOOPDEVICE="`echo ${DEVICE}p${PARTITION:=1}`"
 CYL=`echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p"`
@@ -56,7 +56,7 @@ echo loop $DEVICE at offset $OFFSET
 
 if [ "${PARTITION}" = "0" ]
 then
-	${LH_LOSETUP} "${DEVICE}" "${FILE}"
+	${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
 else
-	${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
+	${LH_ROOT_COMMAND} ${LH_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
 fi
diff --git a/helpers/lh_source_generic b/helpers/lh_source_generic
index 0ffa9fc..d3e8009 100755
--- a/helpers/lh_source_generic
+++ b/helpers/lh_source_generic
@@ -61,6 +61,7 @@ do
 		fi
 
 		# Create tarball
+		Echo_message "Creating tarball, this can take a while."
 		tar cf source.tar source
 
 		# Creating stage file
diff --git a/helpers/lh_source_hdd b/helpers/lh_source_hdd
index 1c8c88b..498a18b 100755
--- a/helpers/lh_source_hdd
+++ b/helpers/lh_source_hdd
@@ -61,6 +61,7 @@ do
 		fi
 
 		# Create tarball
+		Echo_message "Creating tarball, this can take a while."
 		tar cfz source-hdd.tar.gz source
 
 		# Creating stage file
diff --git a/helpers/lh_source_usb b/helpers/lh_source_usb
index 178a558..91207de 100755
--- a/helpers/lh_source_usb
+++ b/helpers/lh_source_usb
@@ -54,29 +54,12 @@ do
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ ! -f chroot/sbin/mkdosfs ]
-		then
-			PACKAGES="${PACKAGES} dosfstools"
-		fi
+		# Checking depends
+		Check_package chroot/sbin/mkdosfs dosfstools
+		Check_package chroot/sbin/parted parted
 
-		if [ ! -f chroot/sbin/parted ]
-		then
-			PACKAGES="${PACKAGES} parted"
-		fi
-
-		if [ -n "${PACKAGES}" ]
-		then
-			# Installing packages
-			case "${LH_APT}" in
-				apt|apt-get)
-					Chroot "apt-get install --yes ${PACKAGES}"
-					;;
-
-				aptitude)
-					Chroot "aptitude install --assume-yes ${PACKAGES}"
-					;;
-			esac
-		fi
+		# Installing depends
+		Install_package
 
 		# Remove old source
 		if [ -f source.img ]
@@ -107,9 +90,9 @@ do
 		lh_losetup $FREELO source.img 1
 		Chroot "mkfs.msdos -n DEBIAN_LIVE ${FREELO}"
 		mkdir -p source.tmp
-		mount ${FREELO} source.tmp
+		${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
 		cp -r source/* source.tmp
-		umount source.tmp
+		${LH_ROOT_COMMAND} umount source.tmp
 		rmdir source.tmp
 		${LH_LOSETUP} -d ${FREELO}
 		echo "!!! The above error/warning messages can be ignored !!!"
@@ -120,19 +103,8 @@ do
 			mv chroot/dev.tmp chroot/dev
 		fi
 
-		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
+		# Removing depends
+		Remove_package
 
 		# Creating stage file
 		Create_stagefile .stage/source_usb
diff --git a/helpers/lh_testroot b/helpers/lh_testroot
index e694529..bb5592e 100755
--- a/helpers/lh_testroot
+++ b/helpers/lh_testroot
@@ -22,10 +22,14 @@ USAGE="${PROGRAM} [--force]"
 
 Arguments "${@}"
 
+# Reading configuration files
+Read_conffile config/common
+Set_defaults
+
 Echo_debug "Init ${PROGRAM}"
 
 # Checking user account
-if [ "`id -u`" -ne "0" ]
+if [ "`${LH_ROOT_COMMAND} id -u`" -ne "0" ]
 then
 	Echo_error "need root privileges"
 	exit 1
diff --git a/helpers/make-live b/helpers/make-live
index 29a6067..35ae73c 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] [--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]"
+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] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|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] [--root-command sudo]"
 
 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:,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 -- "${@}"`"
+	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:,tasksel:,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,root-command: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
 
 	if [ "${?}" != "0" ]
 	then
@@ -120,10 +120,18 @@ Local_arguments ()
 				LH_LOSETUP="${2}"; shift 2
 				;;
 
+			--tasksel)
+				LH_TASKSEL="${2}"; shift 2
+				;;
+
 			-r|--root)
 				LIVE_ROOT="${2}"; shift 2
 				;;
 
+			--root-command)
+				LIVE_ROOT_COMMAND="${2}"; shift 2
+				;;
+
 			# bootstrap
 			-a|--architecture)
 				LIVE_ARCHITECTURE="${2}"; shift 2
@@ -257,7 +265,7 @@ Local_arguments ()
 				;;
 
 			--grub-splash)
-				LIVE_SYSLINUX="${2}"; shift 2
+				LIVE_GRUB_SPLASH="${2}"; shift 2
 				;;
 
 			--syslinux-splash)
@@ -345,7 +353,7 @@ Main ()
 	Local_arguments "${@}"
 
 	# Configuring (this is really shit!)
-	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_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
+	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}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_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_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig
 
 	if [ "${LH_BREAKPOINTS}" = "enabled" ]
 	then
@@ -379,4 +387,8 @@ Main ()
 	fi
 }
 
+trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
+      if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
+      0 1 2 3 9 15
+
 Main "${@}"
diff --git a/hooks/kde-desktop b/hooks/kde-desktop
new file mode 100755
index 0000000..b681a3f
--- /dev/null
+++ b/hooks/kde-desktop
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# /usr/share/live-helper/hooks/kde-desktop - hook list for live-helper(7)
+# Copyright (C) 2006-2007 Daniel Baumann <[email-masked]>
+#
+# 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
+
+apt-get remove --purge --yes gdm
+update-alternatives --set x-session-manager /usr/bin/startkde
+dpkg-reconfigure kdm
diff --git a/includes/sid b/includes/sid
index 5f12354..190cf35 120000
--- a/includes/sid
+++ b/includes/sid
@@ -1 +1 @@
-etch/
\ No newline at end of file
+etch
\ No newline at end of file
diff --git a/lists/rescue b/lists/rescue
index 1c81622..dee78fe 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -13,7 +13,7 @@ mc nano-tiny qemacs-nox mg aview
 # Harddisk
 hdparm blktool scsitools
 # Memory
-memtester memtest86+ dmidecode
+dmidecode
 # System
 procinfo pciutils usbutils hwinfo hwtools x86info cpuid
 # Tools
diff --git a/manpages/lh_binary.1 b/manpages/lh_binary.1
deleted file mode 100644
index 1e2bf35..0000000
--- a/manpages/lh_binary.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.TH LH_BINARY 1 "2007\-04\-16" "1.0~a6" "live\-helper"
-
-.SH NAME
-lh_binary \- meta-helper for lh_binary_*
-
-.SH SYNOPSIS
-.B lh_binary [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_binary is a meta-helper. It calls all necessary helpers to complete the binary stage.
-
-.SH BINARY HELPERS
-Here is the complete list of available binary helper commands. See their man pages for additional documentation.
-.IP "\fIlh_binary_chroot\fR(1)" 4
-copies chroot into chroot.
-.IP "\fIlh_binary_encryption\fR(1)" 4
-encrypts the root filesystem.
-.IP "\fIlh_binary_grub\fR(1)" 4
-copies grub into the binary image.
-.IP "\fIlh_binary_hdd\fR(1)" 4
-creates the harddisk binary tarball.
-.IP "\fIlh_binary_includes\fR(1)" 4
-copies files into the binary image.
-.IP "\fIlh_binary_iso\fR(1)" 4
-creates the CD/DVD binary image.
-.IP "\fIlh_binary_linuximage\fR(1)" 4
-copies linux-image into the binary image.
-.IP "\fIlh_binary_localincludes\fR(1)" 4
-copies local files into the binary image.
-.IP "\fIlh_binary_manifest\fR(1)" 4
-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_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
-creates the root filesystem.
-.IP "\fIlh_binary_syslinux\fR(1)" 4
-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)
-.PP
-This program is a part of live-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_binary.1.de b/manpages/lh_binary.1.de
new file mode 100644
index 0000000..d5fbfb4
--- /dev/null
+++ b/manpages/lh_binary.1.de
@@ -0,0 +1,59 @@
+.TH LH_BINARY 1 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
+
+.SH SYNTAX
+.B lh_binary [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_binary ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die binary\-Stufe zu vervollst\[:a]ndigen.
+
+.SH BINARY HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren binary\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_binary_chroot\fR(1)" 4
+kopiert chroot in chroot.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+verschl\[:u]sselt das Root\-Dateisystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+kopiert grub in das Binary\-Image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+erstellt den Festplatten Binary\-Tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+kopiert Dateien in das Binary\-Image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+erstell das CD/DVD Binary\-Image.
+.IP "\fIlh_binary_linuximage\fR(1)" 4
+kopiert linux\-image in das Binary\-Image.
+.IP "\fIlh_binary_localincludes\fR(1)" 4
+kopiert lokale Dateien in das Binary\-Image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+erstellt die Paketliste des Root\-Dateisystemes.
+.IP "\fIlh_binary_md5sum\fR(1)" 4
+erstellt md5sum.txt im Binary\-Image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+kopiert ein memtest in das Binary\-Image.
+.IP "\fIlh_binary_net\fR(1)" 4
+erstellt den Netboot Binary\-Tarball.
+.IP "\fIlh_binary_rootfs\fR(1)" 4
+erstell das Root\-Dateisystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+kopiert syslinux in das Binary\-Image.
+.IP "\fIlh_binary_usb\fR(1)" 4
+erstellt das USB Binary\-Image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+kopiert yaboot in das Binary\-Image.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/lh_binary.1.en b/manpages/lh_binary.1.en
new file mode 100644
index 0000000..b44f1ea
--- /dev/null
+++ b/manpages/lh_binary.1.en
@@ -0,0 +1,59 @@
+.TH LH_BINARY 1 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_binary \- meta\-helper for lh_binary_*
+
+.SH SYNOPSIS
+.B lh_binary [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_binary is a meta\-helper. It calls all necessary helpers to complete the binary stage.
+
+.SH BINARY HELPERS
+Here is the complete list of available binary helper commands. See their man pages for additional documentation.
+.IP "\fIlh_binary_chroot\fR(1)" 4
+copies chroot into chroot.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+encrypts the root filesystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+copies grub into the binary image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+creates the harddisk binary tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+copies files into the binary image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+creates the CD/DVD binary image.
+.IP "\fIlh_binary_linuximage\fR(1)" 4
+copies linux\-image into the binary image.
+.IP "\fIlh_binary_localincludes\fR(1)" 4
+copies local files into the binary image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+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_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
+creates the root filesystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+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)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_bootstrap.1 b/manpages/lh_bootstrap.1
deleted file mode 100644
index 51a90ad..0000000
--- a/manpages/lh_bootstrap.1
+++ /dev/null
@@ -1,31 +0,0 @@
-.TH LH_BOOTSTRAP 1 "2007\-04\-16" "1.0~a6" "live\-helper"
-
-.SH NAME
-lh_bootstrap \- meta-helper for lh_bootstrap_*
-
-.SH SYNOPSIS
-.B lh_bootstrap [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_bootstrap is a meta-helper. It calls all necessary helpers to complete the bootstrap stage.
-
-.SH BOOTSTRAP HELPERS
-Here is the complete list of available bootstrap helper commands. See their man pages for additional documentation.
-.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
-bootstraps system with cdebootstrap.
-.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
-bootstraps system with debootstrap.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_bootstrap.1.de b/manpages/lh_bootstrap.1.de
new file mode 100644
index 0000000..6473419
--- /dev/null
+++ b/manpages/lh_bootstrap.1.de
@@ -0,0 +1,31 @@
+.TH LH_BOOTSTRAP 1 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
+
+.SH SYNTAX
+.B lh_bootstrap [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_bootstrap ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die bootstrap-Stufe zu vervollst\[:a]ndigen.
+
+.SH BOOTSTRAP HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren bootstrap\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+erstellt ein Debian-System mit cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+erstellt ein Debian-System mit debootstrap.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/lh_bootstrap.1.en b/manpages/lh_bootstrap.1.en
new file mode 100644
index 0000000..0330fbc
--- /dev/null
+++ b/manpages/lh_bootstrap.1.en
@@ -0,0 +1,31 @@
+.TH LH_BOOTSTRAP 1 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_bootstrap \- meta\-helper for lh_bootstrap_*
+
+.SH SYNOPSIS
+.B lh_bootstrap [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_bootstrap is a meta\-helper. It calls all necessary helpers to complete the bootstrap stage.
+
+.SH BOOTSTRAP HELPERS
+Here is the complete list of available bootstrap helper commands. See their man pages for additional documentation.
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+bootstraps system with cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+bootstraps system with debootstrap.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_bootstrap_cdebootstrap.1 b/manpages/lh_bootstrap_cdebootstrap.1
deleted file mode 100644
index 80587b7..0000000
--- a/manpages/lh_bootstrap_cdebootstrap.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.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)
-
-.SH SYNOPSIS
-.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_bootstrap_cdebootstrap uses \fIcdebootstrap\fR(1) to create a Debian base system from scratch.
-
-.SH CONFIGURATION FILE
-lh_bootstrap_cdebootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
-
-.SH ENVIRONMENT
-lh_bootstrap_cdebootstrap respects the following environment variables if available, otherwise uses default values for it.
-.IP "\fI$LH_BOOTSTRAP\fR" 4
-control the bootstrap program to be used (Default: cdebootstrap)
-.IP "\fI$LH_CACHE\fR" 4
-control if downloaded packages should be cached (Default: enabled)
-.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
-select the chroot architecture (Default: autodetected)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
-set distribution config directory (Default: empty)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
-select the flavour to use (Default: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
-select the distribution to use (Default: sid)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
-set the mirror to use (Default: http://ftp.debian.org/debian/)
-
-.SH SEE ALSO
-\fIcdebootstrap\fR(1)
-.PP
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_bootstrap_cdebootstrap.1.de b/manpages/lh_bootstrap_cdebootstrap.1.de
new file mode 100644
index 0000000..4584d4c
--- /dev/null
+++ b/manpages/lh_bootstrap_cdebootstrap.1.de
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
+
+.SH SYNTAX
+.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_bootstrap_cdebootstrap benutzt \fIcdebootstrap\fR(1) um ein Debian Grundsystem zu erstellen.
+
+.SH KONFIGURATIONSDATEI
+lh_bootstrap_cdebootstrap liest config/common und config/bootstrap wenn verf\[:ugbar]. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen.
+
+.SH UMGEBUNG
+lh_bootstrap_cdebootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+kontrolliert das zu benutzende bootstrap-Programm (Standard: cdebootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+w\[:a]hlt die Distribution aus (Standard: etch)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
+
+.SH SIEHE AUCH
+\fIcdebootstrap\fR(1)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/lh_bootstrap_cdebootstrap.1.en b/manpages/lh_bootstrap_cdebootstrap.1.en
new file mode 100644
index 0000000..7a2b352
--- /dev/null
+++ b/manpages/lh_bootstrap_cdebootstrap.1.en
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
+
+.SH SYNOPSIS
+.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_bootstrap_cdebootstrap uses \fIcdebootstrap\fR(1) to create a Debian base system from scratch.
+
+.SH CONFIGURATION FILE
+lh_bootstrap_cdebootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
+
+.SH ENVIRONMENT
+lh_bootstrap_cdebootstrap respects the following environment variables if available, otherwise uses default values for it.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+control the bootstrap program to be used (Default: cdebootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+control if downloaded packages should be cached (Default: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+select the chroot architecture (Default: autodetected)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+set distribution config directory (Default: empty)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+select the flavour to use (Default: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+select the distribution to use (Default: sid)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+set the mirror to use (Default: http://ftp.debian.org/debian/)
+
+.SH SEE ALSO
+\fIcdebootstrap\fR(1)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_bootstrap_debootstrap.1 b/manpages/lh_bootstrap_debootstrap.1
deleted file mode 100644
index 24894c5..0000000
--- a/manpages/lh_bootstrap_debootstrap.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.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)
-
-.SH SYNOPSIS
-.B lh_bootstrap_debootstrap [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_bootstrap_debootstrap uses \fIdebootstrap\fR(8) to create a Debian base system from scratch.
-
-.SH CONFIGURATION FILE
-lh_bootstrap_debootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
-
-.SH ENVIRONMENT
-lh_bootstrap_debootstrap respects the following environment variables if available, otherwise uses default values for it.
-.IP "\fI$LH_BOOTSTRAP\fR" 4
-control the bootstrap program to be used (Default: cdebootstrap)
-.IP "\fI$LH_CACHE\fR" 4
-control if downloaded packages should be cached (Default: enabled)
-.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
-select the chroot architecture (Default: autodetected)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
-set distribution config directory (Default: empty)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
-select the flavour to use (Default: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
-select the distribution to use (Default: sid)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
-set the mirror to use (Default: http://ftp.debian.org/debian/)
-
-.SH SEE ALSO
-\fIdebootstrap\fR(8)
-.PP
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_bootstrap_debootstrap.1.de b/manpages/lh_bootstrap_debootstrap.1.de
new file mode 100644
index 0000000..252522c
--- /dev/null
+++ b/manpages/lh_bootstrap_debootstrap.1.de
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
+
+.SH SYNTAX
+.B lh_bootstrap_debootstrap [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_bootstrap_debootstrap benutzt \fIdebootstrap\fR(8) um ein Debian Grundsystem zu erstellen.
+
+.SH KONFIGURATIONSDATEI
+lh_bootstrap_debootstrap liest config/common und config/bootstrap wenn verf\[:ugbar]. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen.
+
+.SH UMGEBUNG
+lh_bootstrap_debootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+kontrolliert das zu benutzende bootstrap-Programm (Standard: debootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+w\[:a]hlt die Distribution aus (Standard: etch)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
+
+.SH SIEHE AUCH
+\fIdebootstrap\fR(8)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/lh_bootstrap_debootstrap.1.en b/manpages/lh_bootstrap_debootstrap.1.en
new file mode 100644
index 0000000..a472272
--- /dev/null
+++ b/manpages/lh_bootstrap_debootstrap.1.en
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
+
+.SH SYNOPSIS
+.B lh_bootstrap_debootstrap [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_bootstrap_debootstrap uses \fIdebootstrap\fR(8) to create a Debian base system from scratch.
+
+.SH CONFIGURATION FILE
+lh_bootstrap_debootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
+
+.SH ENVIRONMENT
+lh_bootstrap_debootstrap respects the following environment variables if available, otherwise uses default values for it.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+control the bootstrap program to be used (Default: cdebootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+control if downloaded packages should be cached (Default: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+select the chroot architecture (Default: autodetected)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+set distribution config directory (Default: empty)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+select the flavour to use (Default: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+select the distribution to use (Default: sid)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+set the mirror to use (Default: http://ftp.debian.org/debian/)
+
+.SH SEE ALSO
+\fIdebootstrap\fR(8)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_build.1.de b/manpages/lh_build.1.de
new file mode 100644
index 0000000..f49efae
--- /dev/null
+++ b/manpages/lh_build.1.de
@@ -0,0 +1,35 @@
+.TH LH_BUILD 1 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_build \- erstellen eines Live-Systemes
+
+.SH SYNOPSIS
+.B lh_build [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_build ist ein Helper-Script. Es ruft alle n\[:o]tigen Meta\-Helper auf um ein Live-System erfolgreich zu erstellen.
+
+.SH META\-HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Meta\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_binary\fR(1)" 4
+erstellt ein Binary-Image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+erstellt das Grundsystem.
+.IP "\fIlh_chroot\fR(1)" 4
+individualisiert chroot.
+.IP "\fIlh_source\fR(1)" 4
+erstellt ein Source-Image.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/lh_build.1.en b/manpages/lh_build.1.en
new file mode 100644
index 0000000..2494507
--- /dev/null
+++ b/manpages/lh_build.1.en
@@ -0,0 +1,35 @@
+.TH LH_BUILD 1 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_build \- building a live system
+
+.SH SYNOPSIS
+.B lh_build [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_build is a helper script. It calls all required meta\-helper scripts to successfully build a live system.
+
+.SH META\-HELPERS
+Here is the complete list of available meta\-helper commands. See their man pages for additional documentation.
+.IP "\fIlh_binary\fR(1)" 4
+builds a binary image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+bootstraps a system.
+.IP "\fIlh_chroot\fR(1)" 4
+customizes a chroot.
+.IP "\fIlh_source\fR(1)" 4
+builds a source image.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_chroot.1 b/manpages/lh_chroot.1
deleted file mode 100644
index c67e377..0000000
--- a/manpages/lh_chroot.1
+++ /dev/null
@@ -1,71 +0,0 @@
-.TH LH_CHROOT 1 "2007\-04\-16" "1.0~a6" "live\-helper"
-
-.SH NAME
-lh_chroot \- meta-helper for lh_chroot_*
-
-.SH SYNOPSIS
-.B lh_chroot [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_chroot is a meta-helper. It calls all necessary helpers to complete the chroot stage.
-
-.SH CHROOT HELPERS
-Here is the complete list of available chroot helper commands. See their man pages for additional documentation.
-.IP "\fIlh_chroot_apt\fR(1)" 4
-manages /etc/apt/apt.conf.
-.IP "\fIlh_chroot_debianchroot\fR(1)" 4
-manages /etc/debian_chroot.
-.IP "\fIlh_chroot_hacks\fR(1)" 4
-executes hacks in chroot.
-.IP "\fIlh_chroot_hooks\fR(1)" 4
-executes hooks in chroot.
-.IP "\fIlh_chroot_hosts\fR(1)" 4
-manages /etc/hosts.
-.IP "\fIlh_chroot_interactive\fR(1)" 4
-makes build interactive.
-.IP "\fIlh_chroot_linuximage\fR(1)" 4
-manage /etc/kernel-img.conf.
-.IP "\fIlh_chroot_localhooks\fR(1)" 4
-executes local hooks in chroot.
-.IP "\fIlh_chroot_localincludes\fR(1)" 4
-copies local files into chroot.
-.IP "\fIlh_chroot_localization\fR(1)" 4
-installs localization packages into chroot.
-.IP "\fIlh_chroot_localpackages\fR(1)" 4
-installs local packages into chroot.
-.IP "\fIlh_chroot_localpackageslists\fR(1)" 4
-installs local packages lists into chroot.
-.IP "\fIlh_chroot_packages\fR(1)" 4
-installs packages into chroot.
-.IP "\fIlh_chroot_packageslists\fR(1)" 4
-installs packages lists into chroot.
-.IP "\fIlh_chroot_proc\fR(1)" 4
-mounts /proc.
-.IP "\fIlh_chroot_resolv\fR(1)" 4
-manages /etc/resolv.conf.
-.IP "\fIlh_chroot_sources\fR(1)" 4
-manages /etc/apt/apt.conf.
-.IP "\fIlh_chroot_symlinks\fR(1)" 4
-convers symlinks.
-.IP "\fIlh_chroot_sysfs\fR(1)" 4
-mounts /sys.
-.IP "\fIlh_chroot_sysvinit\fR(1)" 4
-configures sysvinit.
-.IP "\fIlh_chroot_sysvrc\fR(1)" 4
-manages /usr/sbin/policy-rc.d.
-.IP "\fIlh_chroot_tasks\fR(1)" 4
-installs tasks into chroot.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_chroot.1.de b/manpages/lh_chroot.1.de
new file mode 100644
index 0000000..b84bfc5
--- /dev/null
+++ b/manpages/lh_chroot.1.de
@@ -0,0 +1,71 @@
+.TH LH_CHROOT 1 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
+
+.SH SYNOPSIS
+.B lh_chroot [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_chroot ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die chroot\-Stufe zu vervollst\[:a]ndigen.
+
+.SH CHROOT HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren chroot\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_chroot_apt\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+verwaltet /etc/debian_chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+f\[:u]hrt Hacks im chroot aus.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+f\[:u]hrt Hooks im chroot aus.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+verwaltet /etc/hosts.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+macht Bauprozess interaktiv.
+.IP "\fIlh_chroot_linuximage\fR(1)" 4
+verwaltet /etc/kernel\-img.conf.
+.IP "\fIlh_chroot_localhooks\fR(1)" 4
+f\[:u]hrt lokale Hooks im chroot aus.
+.IP "\fIlh_chroot_localincludes\fR(1)" 4
+kopiert lokale Dateien in den chroot.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installiert Lokalisierungspakete im chroot.
+.IP "\fIlh_chroot_localpackages\fR(1)" 4
+installiert lokale Pakete im chroot.
+.IP "\fIlh_chroot_localpackageslists\fR(1)" 4
+installiert lokale Paketlisten im chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installiert Pakete im chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installiert Paketlisten im chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+bindet /proc ein.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+verwaltet /etc/resolv.conf.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+konvertiert symbolische Links.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+bindet /sys ein.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+konfiguriert sysvinit.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+verwaltet /usr/sbin/policy\-rc.d.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installiert Paket-Tasks im chroot.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/lh_chroot.1.en b/manpages/lh_chroot.1.en
new file mode 100644
index 0000000..347ec05
--- /dev/null
+++ b/manpages/lh_chroot.1.en
@@ -0,0 +1,71 @@
+.TH LH_CHROOT 1 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_chroot \- meta\-helper for lh_chroot_*
+
+.SH SYNOPSIS
+.B lh_chroot [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_chroot is a meta\-helper. It calls all necessary helpers to complete the chroot stage.
+
+.SH CHROOT HELPERS
+Here is the complete list of available chroot helper commands. See their man pages for additional documentation.
+.IP "\fIlh_chroot_apt\fR(1)" 4
+manages /etc/apt/apt.conf.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+manages /etc/debian_chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+executes hacks in chroot.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+executes hooks in chroot.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+manages /etc/hosts.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+makes build interactive.
+.IP "\fIlh_chroot_linuximage\fR(1)" 4
+manages /etc/kernel\-img.conf.
+.IP "\fIlh_chroot_localhooks\fR(1)" 4
+executes local hooks in chroot.
+.IP "\fIlh_chroot_localincludes\fR(1)" 4
+copies local files into chroot.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installs localization packages into chroot.
+.IP "\fIlh_chroot_localpackages\fR(1)" 4
+installs local packages into chroot.
+.IP "\fIlh_chroot_localpackageslists\fR(1)" 4
+installs local packages lists into chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installs packages into chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installs packages lists into chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+mounts /proc.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+manages /etc/resolv.conf.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+manages /etc/apt/apt.conf.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+convers symlinks.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+mounts /sys.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+configures sysvinit.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+manages /usr/sbin/policy\-rc.d.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installs tasks into chroot.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_clean.1 b/manpages/lh_clean.1
deleted file mode 100644
index 163f813..0000000
--- a/manpages/lh_clean.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.TH LH_CLEAN 1 "2007\-04\-16" "1.0~a6" "live\-helper"
-
-.SH NAME
-lh_clean \- clean up system build directories
-
-.SH SYNOPSIS
-.B lh_clean [\fIlive\-helper\ options\fR\|]
-.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
-
-.SH DESCRIPTION
-lh_clean is a live\-helper program that is responsible for cleaning up after a system is built. It removes the system build directories, and removes some other files including stage files, and any detritus left behind by other live\-helper commands.
-
-.SH OPTIONS
-The following command line options are supported by lh_clean.
-.IP "\fBall\fR" 4
-removes chroot, binary, lock, stage, and source. This is the default operation.
-.IP "\fBcache\fR" 4
-removes all cache directories.
-.IP "\fBchroot\fR" 4
-unmounts and removes the chroot directory. If bootstrap cache is available, the system is reset to bootstrap stage.
-.IP "\fBbinary\fR" 4
-removes all binary related caches, directories, and stages files.
-.IP "\fBlock\fR" 4
-removes all lock files.
-.IP "\fBpurge\fR" 4
-removes everything (including cache) but config.
-.IP "\fBstage\fR" 4
-removes all stage files.
-.IP "\fBsource\fR" 4
-removes all source related caches, directories, and stage files.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_clean.1.de b/manpages/lh_clean.1.de
new file mode 100644
index 0000000..aacc0a3
--- /dev/null
+++ b/manpages/lh_clean.1.de
@@ -0,0 +1,44 @@
+.TH LH_CLEAN 1 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_clean \- r\[:a]umt das Build-Verzeichnis auf
+
+.SH SYNOPSIS
+.B lh_clean [\fIlive\-helper\ Optionen\fR\|]
+.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
+
+.SH BESCHREIBUNG
+lh_clean ist ein live\-helper\-Program das daf\[:u]r verwantwortlich ist, nach dem Bauen eines Live-Systemes das Build-Verzeichnis aufzur\[:a]umen. Es entfernt das Build-Verzeichnis und auch alle anderen Dateien, inklusive den Stage-Dateien die von einem live\-helper-Programm hinterlassen worden ist.
+
+.SH OPTIONEN
+Die folgenden Optionen werden von lh_clean unterst\[:u]tzt.
+.IP "\fBall\fR" 4
+entfernt chroot, binary, lock, stage und source. Das ist die Standardoperation.
+.IP "\fBcache\fR" 4
+entfernt alle cache-Verzeichnisse.
+.IP "\fBchroot\fR" 4
+entbindet und entfernt das chroot-Verzeichnis. Wenn ein Cache von bootstrap verf\[:u]gbar ist, wird chroot auf diese Stufe zur\[:u]ck gesetzt.
+.IP "\fBbinary\fR" 4
+entfernt alle Caches, Verzeichnisse und Stage-Dateien der Binary-Stufe.
+.IP "\fBlock\fR" 4
+entfernt alle lock-Dateien.
+.IP "\fBpurge\fR" 4
+entfernt alles (inlusive cache) ausser config.
+.IP "\fBstage\fR" 4
+entfernt alle Stage-Dateien.
+.IP "\fBsource\fR" 4
+entfernt alle Caches, Verzeichnisse und Stage-Dateien der Source-Stufe.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/lh_clean.1.en b/manpages/lh_clean.1.en
new file mode 100644
index 0000000..acdd3de
--- /dev/null
+++ b/manpages/lh_clean.1.en
@@ -0,0 +1,44 @@
+.TH LH_CLEAN 1 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_clean \- clean up system build directories
+
+.SH SYNOPSIS
+.B lh_clean [\fIlive\-helper\ options\fR\|]
+.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
+
+.SH DESCRIPTION
+lh_clean is a live\-helper program that is responsible for cleaning up after a system is built. It removes the system build directories, and removes some other files including stage files, and any detritus left behind by other live\-helper commands.
+
+.SH OPTIONS
+The following command line options are supported by lh_clean.
+.IP "\fBall\fR" 4
+removes chroot, binary, lock, stage, and source. This is the default operation.
+.IP "\fBcache\fR" 4
+removes all cache directories.
+.IP "\fBchroot\fR" 4
+unmounts and removes the chroot directory. If bootstrap cache is available, the system is reset to bootstrap stage.
+.IP "\fBbinary\fR" 4
+removes all binary related caches, directories, and stages files.
+.IP "\fBlock\fR" 4
+removes all lock files.
+.IP "\fBpurge\fR" 4
+removes everything (including cache) but config.
+.IP "\fBstage\fR" 4
+removes all stage files.
+.IP "\fBsource\fR" 4
+removes all source related caches, directories, and stage files.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_source.1.de b/manpages/lh_source.1.de
new file mode 100644
index 0000000..238903e
--- /dev/null
+++ b/manpages/lh_source.1.de
@@ -0,0 +1,43 @@
+.TH LH_SOURCE 1 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_source \- Meta\-Helper f\[:u]r lh_source_*
+
+.SH SYNTAX
+.B lh_source [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_source ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die source\-Stufe zu vervollst\[:a]ndigen.
+
+.SH SOURCE HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren source\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_source_config\fR(1)" 4
+kopiert debian\-live Konfiguration in source.
+.IP "\fIlh_source_download\fR(1)" 4
+l\[:a]dt Paketquellen herunter.
+.IP "\fIlh_source_generic\fR(1)" 4
+erstellt den generischen Source-Tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+erstellt den Harddisk Source-Tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+erstellt  CD/DVD Source-Image.
+.IP "\fIlh_source_md5sum\fR(1)" 4
+erstellt md5sum.txt im Source-Image.
+.IP "\fIlh_source_net\fR(1)" 4
+erstellt Netboot Source-Tarball.
+.IP "\fIlh_source_usb\fR(1)" 4
+erstellt USB Source-Tarball.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/lh_source.1.en b/manpages/lh_source.1.en
new file mode 100644
index 0000000..a259101
--- /dev/null
+++ b/manpages/lh_source.1.en
@@ -0,0 +1,43 @@
+.TH LH_SOURCE 1 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_source \- meta\-helper for lh_source_*
+
+.SH SYNOPSIS
+.B lh_source [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_source is a meta\-helper. It calls all necessary helpers to complete the source stage.
+
+.SH SOURCE HELPERS
+Here is the complete list of available source helper commands. See their man pages for additional documentation.
+.IP "\fIlh_source_config\fR(1)" 4
+copies debian\-live config into source.
+.IP "\fIlh_source_download\fR(1)" 4
+downloads sources.
+.IP "\fIlh_source_generic\fR(1)" 4
+creates the generic source tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+creates the harddisk source tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+creates the CD/DVD source image.
+.IP "\fIlh_source_md5sum\fR(1)" 4
+creates md5sum.txt in the source image.
+.IP "\fIlh_source_net\fR(1)" 4
+creates the netboot source tarball.
+.IP "\fIlh_source_usb\fR(1)" 4
+creates the USB source image.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_testroot.1 b/manpages/lh_testroot.1
deleted file mode 100644
index c6b20ef..0000000
--- a/manpages/lh_testroot.1
+++ /dev/null
@@ -1,24 +0,0 @@
-.TH LH_TESTROOT 1 "2007\-04\-16" "1.0~a6" "live\-helper"
-
-.SH NAME
-lh_testroot \- ensure that a system is built as root
-
-.SH SYNOPSIS
-.B lh_testroot [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_testroot simply checks to see if you are root. If not, it exits with an error. Debian Live images must currently be built as real root, \fIfakeroot\fR(1) or \fIsudo\fR(8) does not work.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/lh_testroot.1.de b/manpages/lh_testroot.1.de
new file mode 100644
index 0000000..d78cadb
--- /dev/null
+++ b/manpages/lh_testroot.1.de
@@ -0,0 +1,24 @@
+.TH LH_TESTROOT 1 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_testroot \- stellt sicher dass das System als root gebaut wird
+
+.SH SYNTAX
+.B lh_testroot [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_testroot kontrolliert ob root-Rechte vorhanden sind. Wenn nicht, endet es mit einem Fehler. Debian Live-Images m\[:u]ssen momentan als root gebaut werden, \fIfakeroot\fR(1) oder \fIsudo\fR(8) funktioniert nicht.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/lh_testroot.1.en b/manpages/lh_testroot.1.en
new file mode 100644
index 0000000..653ecd7
--- /dev/null
+++ b/manpages/lh_testroot.1.en
@@ -0,0 +1,24 @@
+.TH LH_TESTROOT 1 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+lh_testroot \- ensure that a system is built as root
+
+.SH SYNOPSIS
+.B lh_testroot [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_testroot simply checks to see if you are root. If not, it exits with an error. Debian Live images must currently be built as real root, \fIfakeroot\fR(1) or \fIsudo\fR(8) does not work.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/live-helper.7 b/manpages/live-helper.7
deleted file mode 100644
index 2f2f4b4..0000000
--- a/manpages/live-helper.7
+++ /dev/null
@@ -1,171 +0,0 @@
-.TH LIVE\-HELPER 7 "2007\-04\-16" "1.0~a6" "live\-helper"
-
-.SH NAME
-live\-helper \- Debian Live helper programs
-
-.SH SYNOPSIS
-.B lh_* [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-Live\-helper is a collection of programs that can be used to build Debian Live system images. The philosophy behind live\-helper is to provide a collection of small, simple, and easily understood tools that can be used in your own program to automate building of a Live system.
-.PP
-A typical program that uses live\-helper will call several live\-helper commands in sequence. Live\-helper commands are all named with a "lh_" prefix. Examples of such a program that uses live\-helper is \fImake\-live\fR(1).
-
-.\" .SH CONFIGURATION FILE
-.\" live-helper reads debian-live/config/live-helper if available. See ENVIRONMENT for the correct environment variables to use.
-
-.\" .SH ENVIRONMENT
-.\" Every live-helper command respects the following environment variables if available.
-.\" .IP "\fI$LH_DEBUG\fR" 4
-.\" enables debug (Default: false)
-.\" .IP "\fI$LH_QUIET\fR" 4
-.\" be quiet (Default: false)
-.\" .IP "\fI$LH_VERBOSE\fR" 4
-.\" be verbose (Default: false)
-
-.SH LIVE\-HELPER COMMANDS
-Here is the complete list of available live\-helper commands. See their man pages for additional documentation.
-.IP "\fIlh_binary\fR(1)" 4
-meta-helper for lh_binary_*.
-.IP "\fIlh_binary_chroot\fR(1)" 4
-copies chroot into chroot.
-.IP "\fIlh_binary_encryption\fR(1)" 4
-encrypts the root filesystem.
-.IP "\fIlh_binary_grub\fR(1)" 4
-copies grub into the binary image.
-.IP "\fIlh_binary_hdd\fR(1)" 4
-creates the harddisk binary tarball.
-.IP "\fIlh_binary_includes\fR(1)" 4
-copies files into the binary image.
-.IP "\fIlh_binary_iso\fR(1)" 4
-creates the CD/DVD binary image.
-.IP "\fIlh_binary_linuximage\fR(1)" 4
-copies linux-image into the binary image.
-.IP "\fIlh_binary_localincludes\fR(1)" 4
-copies local files into the binary image.
-.IP "\fIlh_binary_manifest\fR(1)" 4
-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_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
-creates the root filesystem.
-.IP "\fIlh_binary_syslinux\fR(1)" 4
-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
-bootstraps system with cdebootstrap.
-.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
-bootstraps system with debootstrap.
-.IP "\fIlh_build\fR(1)" 4
-meta-helper for lh_bootstrap, lh_chroot, lh_binary and lh_source.
-.IP "\fIlh_chroot\fR(1)" 4
-meta-helper for lh_chroot_*.
-.IP "\fIlh_chroot_apt\fR(1)" 4
-configures /etc/apt/apt.conf in chroot.
-.IP "\fIlh_chroot_debianchroot\fR(1)" 4
-configures /etc/debian_chroot in chroot.
-.IP "\fIlh_chroot_hacks\fR(1)" 4
-does evil (temporary) hacks in the chroot.
-.IP "\fIlh_chroot_hooks\fR(1)" 4
-executes additional commands in the chroot.
-.IP "\fIlh_chroot_hosts\fR(1)" 4
-configures /etc/hosts in the chroot.
-.IP "\fIlh_chroot_interactive\fR(1)" 4
-makes build interactive.
-.IP "\fIlh_chroot_linuximage\fR(1)" 4
-configures /etc/kernel-img.conf in the chroot.
-.IP "\fIlh_chroot_localhooks\fR(1)" 4
-executes additional local commands in the chroot.
-.IP "\fIlh_chroot_localincludes\fR(1)" 4
-copies local files into the binary image.
-.IP "\fIlh_chroot_localization\fR(1)" 4
-installs localization packages in the chroot.
-.IP "\fIlh_chroot_localpackages\fR(1)" 4
-installs local packages in the chroot.
-.IP "\fIlh_chroot_localpackageslists\fR(1)" 4
-installs local packages lists in the chroot.
-.IP "\fIlh_chroot_packages\fR(1)" 4
-installs packages in the chroot.
-.IP "\fIlh_chroot_packageslists\fR(1)" 4
-installs packages lists in the chroot.
-.IP "\fIlh_chroot_proc\fR(1)" 4
-mounts /proc in the chroot.
-.IP "\fIlh_chroot_resolv\fR(1)" 4
-configures /etc/resolf.conf in the chroot.
-.IP "\fIlh_chroot_sources\fR(1)" 4
-configures /etc/apt/sources.list in the chroot.
-.IP "\fIlh_chroot_symlinks\fR(1)" 4
-converts symlinks in the chroot.
-.IP "\fIlh_chroot_sysfs\fR(1)" 4
-mounts /sys in the chroot.
-.IP "\fIlh_chroot_sysvinit\fR(1)" 4
-minimizes daemon startup in the chroot.
-.IP "\fIlh_chroot_sysvrc\fR(1)" 4
-installs policy-id hack in the chroot.
-.IP "\fIlh_chroot_tasks\fR(1)" 4
-installs packages tasks in the chroot.
-.IP "\fIlh_clean\fR(1)" 4
-cleans up build directory.
-.IP "\fIlh_config\fR(1)" 4
-creates sample configuration.
-.IP "\fIlh_losetup\fR(1)" 4
-manages loop device handling
-.IP "\fIlh_source\fR(1)" 4
-meta-helper for lh_source_*.
-.IP "\fIlh_source_config\fR(1)" 4
-copies config into source directory.
-.IP "\fIlh_source_download\fR(1)" 4
-downloads source packages.
-.IP "\fIlh_source_generic\fR(1)" 4
-creates generic source tarball.
-.IP "\fIlh_source_hdd\fR(1)" 4
-creates harddisk source tarball.
-.IP "\fIlh_source_iso\fR(1)" 4
-creates CD/DVD source image.
-.IP "\fIlh_source_net\fR(1)" 4
-creates netboot source tarball.
-.IP "\fIlh_source_usb\fR(1)" 4
-creates USB source image.
-.IP "\fIlh_testroot\fR(1)" 4
-checks for root privileges.
-
-.SH LIVE\-HELPER OPTIONS
-The following command line options are supported by all live\-helper programs.
-.IP "\fB\-\-breakpoints\fR" 4
-run with breakpoints
-.IP "\fB\-\-conffile\fR" 4
-use custom configuration file
-.IP "\fB\-\-debug\fR" 4
-show debug information
-.IP "\fB\-\-force\fR" 4
-force helper execution, even if stage file exists.
-.IP "\fB\-h, \-\-help\fR" 4
-display help and exit
-.IP "\fB\-\-logfile\fR" 4
-use custom log file
-.IP "\fB\-\-quiet\fR" 4
-be quiet
-.IP "\fB\-u, \-\-usage\fR" 4
-show usage and exit
-.IP "\fB\-\-verbose\fR" 4
-be verbose
-.IP "\fB\-v, \-\-version\fR" 4
-output version information and exit
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/live-helper.7.de b/manpages/live-helper.7.de
new file mode 100644
index 0000000..8be6c3c
--- /dev/null
+++ b/manpages/live-helper.7.de
@@ -0,0 +1,173 @@
+.TH LIVE\-HELPER 7 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+live\-helper \- Debian Live Helper-Programme
+
+.SH SYNTAX
+.B lh_* [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+Live\-helper ist eine Sammlung von programmen die dazu benutzt werden k\[:o]nnen, Debian Live Systeme zu erstellen. Die Philosophie hinter live\-helper ist eine kleine Sammlung von kleinen, kurzen und einfach zu verstehenden Werkzeugen zur verf\[:u]gung zu stellen, welche auch in anderen Programmen benutzt werden k\[:o]nnen um automatisch Live-Systeme erstellen.
+.PP
+Ein typisches Programm das live\-helper benutzt wird verschiedene live\-helper Kommandos nacheinander aufrufen. Live\-helper Kommandos haben alle einen "lh_"-Pr\[:a]fix im Namen. Beispiele eines solchen Programmes das live\-helper benutzt ist \fImake\-live\fR(1).
+
+.\" .SH CONFIGURATION FILE
+.\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use.
+
+.\" .SH ENVIRONMENT
+.\" Every live\-helper command respects the following environment variables if available.
+.\" .IP "\fI$LH_DEBUG\fR" 4
+.\" enables debug (Default: false)
+.\" .IP "\fI$LH_QUIET\fR" 4
+.\" be quiet (Default: false)
+.\" .IP "\fI$LH_VERBOSE\fR" 4
+.\" be verbose (Default: false)
+
+.SH LIVE\-HELPER KOMMANDOS
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren live\-helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_binary\fR(1)" 4
+Meta\-Helper f\[:u]r lh_binary_*
+.IP "\fIlh_binary_chroot\fR(1)" 4
+kopiert chroot in chroot.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+verschl\[:u]sselt das Root\-Dateisystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+kopiert grub in das Binary\-Image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+erstellt den Festplatten Binary\-Tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+kopiert Dateien in das Binary\-Image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+erstell das CD/DVD Binary\-Image.
+.IP "\fIlh_binary_linuximage\fR(1)" 4
+kopiert linux\-image in das Binary\-Image.
+.IP "\fIlh_binary_localincludes\fR(1)" 4
+kopiert lokale Dateien in das Binary\-Image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+erstellt die Paketliste des Root\-Dateisystemes.
+.IP "\fIlh_binary_md5sum\fR(1)" 4
+erstellt md5sum.txt im Binary\-Image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+kopiert ein memtest in das Binary\-Image.
+.IP "\fIlh_binary_net\fR(1)" 4
+erstellt den Netboot Binary\-Tarball.
+.IP "\fIlh_binary_rootfs\fR(1)" 4
+erstell das Root\-Dateisystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+kopiert syslinux in das Binary\-Image.
+.IP "\fIlh_binary_usb\fR(1)" 4
+erstellt das USB Binary\-Image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+kopiert yaboot in das Binary\-Image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+Meta\-Helper f\[:u]r lh_bootstrap_*
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+erstellt ein Debian-System mit cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+erstellt ein Debian-System mit debootstrap.
+.IP "\fIlh_build\fR(1)" 4
+erstellen eines Live-Systemes
+.IP "\fIlh_chroot\fR(1)" 4
+Meta\-Helper f\[:u]r lh_chroot_*
+.IP "\fIlh_chroot_apt\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+verwaltet /etc/debian_chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+f\[:u]hrt Hacks im chroot aus.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+f\[:u]hrt Hooks im chroot aus.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+verwaltet /etc/hosts.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+macht Bauprozess interaktiv.
+.IP "\fIlh_chroot_linuximage\fR(1)" 4
+verwaltet /etc/kernel\-img.conf.
+.IP "\fIlh_chroot_localhooks\fR(1)" 4
+f\[:u]hrt lokale Hooks im chroot aus.
+.IP "\fIlh_chroot_localincludes\fR(1)" 4
+kopiert lokale Dateien in den chroot.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installiert Lokalisierungspakete im chroot.
+.IP "\fIlh_chroot_localpackages\fR(1)" 4
+installiert lokale Pakete im chroot.
+.IP "\fIlh_chroot_localpackageslists\fR(1)" 4
+installiert lokale Paketlisten im chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installiert Pakete im chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installiert Paketlisten im chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+bindet /proc ein.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+verwaltet /etc/resolv.conf.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+konvertiert symbolische Links.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+bindet /sys ein.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+konfiguriert sysvinit.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+verwaltet /usr/sbin/policy\-rc.d.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installiert Paket-Tasks im chroot.
+.IP "\fIlh_clean\fR(1)" 4
+r\[:a]umt das Build-Verzeichnis auf
+.IP "\fIlh_config\fR(1)" 4
+erstellt eine Beispielkonfiguration
+.IP "\fIlh_losetup\fR(1)" 4
+verwaltet Loop-Ger\[:a]te
+.IP "\fIlh_source\fR(1)" 4
+Meta\-Helper f\[:u]r lh_source_*
+.IP "\fIlh_source_config\fR(1)" 4
+kopiert debian\-live Konfiguration in source.
+.IP "\fIlh_source_download\fR(1)" 4
+l\[:a]dt Paketquellen herunter.
+.IP "\fIlh_source_generic\fR(1)" 4
+erstellt den generischen Source-Tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+erstellt den Harddisk Source-Tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+erstellt  CD/DVD Source-Image.
+.IP "\fIlh_source_md5sum\fR(1)" 4
+erstellt md5sum.txt im Source-Image.
+.IP "\fIlh_source_net\fR(1)" 4
+erstellt Netboot Source-Tarball.
+.IP "\fIlh_source_usb\fR(1)" 4
+erstellt USB Source-Tarball.
+.IP "\fIlh_testroot\fR(1)" 4
+stellt sicher dass das System als root gebaut wird.
+
+.SH LIVE\-HELPER OPTIONEN
+Die folgenden Kommandozeilenoptionen werden von allen live\-helper-Programmen unterst\[:u]tzt.
+.IP "\fB\-\-breakpoints\fR" 4
+Ausf\[:u]hrung mit Breakpoints.
+.IP "\fB\-\-conffile\fR" 4
+benutzen von eigenen Konfigurationsdateien.
+.IP "\fB\-\-debug\fR" 4
+zeigt Debug Informationen.
+.IP "\fB\-\-force\fR" 4
+erzwingt Helper Ausf\[:u]hrung, auch wenn Stage-Datei existiert.
+.IP "\fB\-h, \-\-help\fR" 4
+zeigt Hilfe Informationen und stoppt.
+.IP "\fB\-\-logfile\fR" 4
+benutzen von eigener Log-Datei.
+.IP "\fB\-\-quiet\fR" 4
+still
+.IP "\fB\-u, \-\-usage\fR" 4
+zeigt Anwedungshinweise und stoppt.
+.IP "\fB\-\-verbose\fR" 4
+gespr\[:a]chig
+.IP "\fB\-v, \-\-version\fR" 4
+gibt Versionsinformationen aus und stoppt.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/live-helper.7.en b/manpages/live-helper.7.en
new file mode 100644
index 0000000..b32a736
--- /dev/null
+++ b/manpages/live-helper.7.en
@@ -0,0 +1,171 @@
+.TH LIVE\-HELPER 7 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+live\-helper \- Debian Live helper programs
+
+.SH SYNOPSIS
+.B lh_* [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+Live\-helper is a collection of programs that can be used to build Debian Live system images. The philosophy behind live\-helper is to provide a collection of small, simple, and easily understood tools that can be used in your own program to automate building of a Live system.
+.PP
+A typical program that uses live\-helper will call several live\-helper commands in sequence. Live\-helper commands are all named with a "lh_" prefix. Examples of such a program that uses live\-helper is \fImake\-live\fR(1).
+
+.\" .SH CONFIGURATION FILE
+.\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use.
+
+.\" .SH ENVIRONMENT
+.\" Every live\-helper command respects the following environment variables if available.
+.\" .IP "\fI$LH_DEBUG\fR" 4
+.\" enables debug (Default: false)
+.\" .IP "\fI$LH_QUIET\fR" 4
+.\" be quiet (Default: false)
+.\" .IP "\fI$LH_VERBOSE\fR" 4
+.\" be verbose (Default: false)
+
+.SH LIVE\-HELPER COMMANDS
+Here is the complete list of available live\-helper commands. See their man pages for additional documentation.
+.IP "\fIlh_binary\fR(1)" 4
+meta\-helper for lh_binary_*.
+.IP "\fIlh_binary_chroot\fR(1)" 4
+copies chroot into chroot.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+encrypts the root filesystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+copies grub into the binary image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+creates the harddisk binary tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+copies files into the binary image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+creates the CD/DVD binary image.
+.IP "\fIlh_binary_linuximage\fR(1)" 4
+copies linux\-image into the binary image.
+.IP "\fIlh_binary_localincludes\fR(1)" 4
+copies local files into the binary image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+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_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
+creates the root filesystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+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
+bootstraps system with cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+bootstraps system with debootstrap.
+.IP "\fIlh_build\fR(1)" 4
+meta\-helper for lh_bootstrap, lh_chroot, lh_binary and lh_source.
+.IP "\fIlh_chroot\fR(1)" 4
+meta\-helper for lh_chroot_*.
+.IP "\fIlh_chroot_apt\fR(1)" 4
+configures /etc/apt/apt.conf in chroot.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+configures /etc/debian_chroot in chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+does evil (temporary) hacks in the chroot.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+executes additional commands in the chroot.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+configures /etc/hosts in the chroot.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+makes build interactive.
+.IP "\fIlh_chroot_linuximage\fR(1)" 4
+configures /etc/kernel\-img.conf in the chroot.
+.IP "\fIlh_chroot_localhooks\fR(1)" 4
+executes additional local commands in the chroot.
+.IP "\fIlh_chroot_localincludes\fR(1)" 4
+copies local files into the binary image.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installs localization packages in the chroot.
+.IP "\fIlh_chroot_localpackages\fR(1)" 4
+installs local packages in the chroot.
+.IP "\fIlh_chroot_localpackageslists\fR(1)" 4
+installs local packages lists in the chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installs packages in the chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installs packages lists in the chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+mounts /proc in the chroot.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+configures /etc/resolf.conf in the chroot.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+configures /etc/apt/sources.list in the chroot.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+converts symlinks in the chroot.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+mounts /sys in the chroot.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+minimizes daemon startup in the chroot.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+installs policy\-id hack in the chroot.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installs packages tasks in the chroot.
+.IP "\fIlh_clean\fR(1)" 4
+cleans up build directory.
+.IP "\fIlh_config\fR(1)" 4
+creates sample configuration.
+.IP "\fIlh_losetup\fR(1)" 4
+manages loop device handling
+.IP "\fIlh_source\fR(1)" 4
+meta\-helper for lh_source_*.
+.IP "\fIlh_source_config\fR(1)" 4
+copies config into source directory.
+.IP "\fIlh_source_download\fR(1)" 4
+downloads source packages.
+.IP "\fIlh_source_generic\fR(1)" 4
+creates generic source tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+creates harddisk source tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+creates CD/DVD source image.
+.IP "\fIlh_source_net\fR(1)" 4
+creates netboot source tarball.
+.IP "\fIlh_source_usb\fR(1)" 4
+creates USB source image.
+.IP "\fIlh_testroot\fR(1)" 4
+checks for root privileges.
+
+.SH LIVE\-HELPER OPTIONS
+The following command line options are supported by all live\-helper programs.
+.IP "\fB\-\-breakpoints\fR" 4
+run with breakpoints
+.IP "\fB\-\-conffile\fR" 4
+use custom configuration file
+.IP "\fB\-\-debug\fR" 4
+show debug information
+.IP "\fB\-\-force\fR" 4
+force helper execution, even if stage file exists.
+.IP "\fB\-h, \-\-help\fR" 4
+display help and exit
+.IP "\fB\-\-logfile\fR" 4
+use custom log file
+.IP "\fB\-\-quiet\fR" 4
+be quiet
+.IP "\fB\-u, \-\-usage\fR" 4
+show usage and exit
+.IP "\fB\-\-verbose\fR" 4
+be verbose
+.IP "\fB\-v, \-\-version\fR" 4
+output version information and exit
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/manpages/make-live.1.de b/manpages/make-live.1.de
new file mode 100644
index 0000000..c756f79
--- /dev/null
+++ b/manpages/make-live.1.de
@@ -0,0 +1,88 @@
+.TH MAKE\-LIVE 1 "23.04.2007" "1.0~a7" "live\-helper"
+
+.SH NAME
+make\-live \- erstellt ein Debian Live-System
+
+.SH SYNOPSIS
+.B make\-live
+[config]
+[\-\-mode \fIMODE\fR]
+[\-\-config \fICONFIG\fR]
+[\-\-apt \fIapt\fR|\fIaptitude\fR]
+[\-\-apt\-ftpproxy \fIURL\fR]
+[\-\-apt\-httpproxy \fIURL\fR]
+[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
+[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
+[\-\-cache \fIenabled\fR|\fIdisabled\fR]
+[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
+[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
+[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
+[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
+[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
+[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
+[\-r|\-\-root \fIDIRECTORY\fR]
+[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
+[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
+[\-\-distribution\-config \fIDIRECTORY\fR]
+[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
+[\-m|\-\-mirror\-build \fIURL\fR]
+[\-\-mirror\-build\-security \fIURL\fR]
+[\-\-mirror\-image \fIURL\fR]
+[\-\-mirror\-image\-security \fIURL\fR]
+[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
+[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
+[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
+[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
+[\-l|\-\-language \fILANGUAGE\fR]
+[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
+[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
+[\-\-security \fIenabled\fR|\fIdisabled\fR]
+[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
+[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
+[\-e|\-\-encryption \fIALGORITHM\fR]
+[\-\-username \fINAME\fR]
+[\-\-hostname \fINAME\fR]
+[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
+[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
+[\-\-iso\-volume \fISTRING\fR]
+[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
+[\-\-server\-path \fIDIRECTORY\fR]
+[\-\-source \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
+[\-\-grub\-splash \fIFILE\fR]
+[\-\-syslinux\-splash \fIFILE\fR]
+[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb\fR|\fInet\fR]
+[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb\fR|\fInet\fR]
+[\-\-includes \fIPATH\fR]
+[\-\-templates \fIPATH\fR]
+[\-\-breakpoints]
+[\-\-debug]
+[\-\-force]
+[\-\-quiet]
+[\-\-verbose]
+
+.SH BESCHREIBUNG
+make\-live is ein Script das alle n\[:o]tigen live\-helper Programme aufruft um ein Live-System zu erstellen.
+
+.SH OPTIONEN
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\[email-masked]\fR> f\[:u]r das Debian\-Projekt geschrieben.
diff --git a/manpages/make-live.1.en b/manpages/make-live.1.en
new file mode 100644
index 0000000..b41a2fb
--- /dev/null
+++ b/manpages/make-live.1.en
@@ -0,0 +1,88 @@
+.TH MAKE\-LIVE 1 "2007\-04\-23" "1.0~a7" "live\-helper"
+
+.SH NAME
+make\-live \- build a Debian Live system
+
+.SH SYNOPSIS
+.B make\-live
+[config]
+[\-\-mode \fIMODE\fR]
+[\-\-config \fICONFIG\fR]
+[\-\-apt \fIapt\fR|\fIaptitude\fR]
+[\-\-apt\-ftpproxy \fIURL\fR]
+[\-\-apt\-httpproxy \fIURL\fR]
+[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
+[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
+[\-\-cache \fIenabled\fR|\fIdisabled\fR]
+[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
+[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
+[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
+[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
+[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
+[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
+[\-r|\-\-root \fIDIRECTORY\fR]
+[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
+[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
+[\-\-distribution\-config \fIDIRECTORY\fR]
+[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
+[\-m|\-\-mirror\-build \fIURL\fR]
+[\-\-mirror\-build\-security \fIURL\fR]
+[\-\-mirror\-image \fIURL\fR]
+[\-\-mirror\-image\-security \fIURL\fR]
+[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
+[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
+[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
+[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
+[\-l|\-\-language \fILANGUAGE\fR]
+[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
+[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
+[\-\-security \fIenabled\fR|\fIdisabled\fR]
+[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
+[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
+[\-e|\-\-encryption \fIALGORITHM\fR]
+[\-\-username \fINAME\fR]
+[\-\-hostname \fINAME\fR]
+[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
+[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
+[\-\-iso\-volume \fISTRING\fR]
+[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
+[\-\-server\-path \fIDIRECTORY\fR]
+[\-\-source \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
+[\-\-grub\-splash \fIFILE\fR]
+[\-\-syslinux\-splash \fIFILE\fR]
+[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb\fR|\fInet\fR]
+[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb\fR|\fInet\fR]
+[\-\-includes \fIPATH\fR]
+[\-\-templates \fIPATH\fR]
+[\-\-breakpoints]
+[\-\-debug]
+[\-\-force]
+[\-\-quiet]
+[\-\-verbose]
+
+.SH DESCRIPTION
+make\-live is a script calling all required live\-helper(7) programs to build a live system.
+
+.SH OPTIONS
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\[email-masked]\fR> for the Debian project.
diff --git a/templates/syslinux/isolinux.cfg b/templates/syslinux/isolinux.cfg
index 212f8d0..b6c465f 100644
--- a/templates/syslinux/isolinux.cfg
+++ b/templates/syslinux/isolinux.cfg
@@ -1,7 +1,11 @@
 default live
+
 LIVE_KERNEL_LIVE
+
 LIVE_KERNEL_INSTALL
+
 LIVE_MEMTEST
+
 display isolinux.txt
 timeout 0
 prompt 1
-- 
cgit v1.0