Updating copyright headers for live-build.

113 files changed, 888 insertions, 680 deletions

diff --git a/cgi/cgi b/cgi/cgi
index 5a9e32f20..d3b3cfd8a 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# cgi - simple webfrontend for live-helper
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 # Including common functions
 . "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
diff --git a/cgi/cron b/cgi/cron
index 47b1f4ca3..0abc5de05 100755
--- a/cgi/cron
+++ b/cgi/cron
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# cgi - simple webfrontend for live-helper (cronjob)
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 # Including common functions
 . "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
diff --git a/functions/aliases.sh b/functions/aliases.sh
index d281692b7..8e1dddad4 100755
--- a/functions/aliases.sh
+++ b/functions/aliases.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# aliases.sh - internal shell aliases
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Find_files ()
 {
diff --git a/functions/architecture.sh b/functions/architecture.sh
index 223817654..9e6a49abe 100755
--- a/functions/architecture.sh
+++ b/functions/architecture.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# architecture.sh - handle architecture specific support
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Check_architecture ()
 {
diff --git a/functions/arguments.sh b/functions/arguments.sh
index d35d02e89..0db3c13d0 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# arguments.sh - handle common arguments
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Arguments ()
 {
diff --git a/functions/breakpoints.sh b/functions/breakpoints.sh
index ba1079367..29ab8610c 100755
--- a/functions/breakpoints.sh
+++ b/functions/breakpoints.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# breakpoints.sh - run with breakpoints
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Breakpoint ()
 {
diff --git a/functions/cache.sh b/functions/cache.sh
index e6f4957c7..b656512f0 100755
--- a/functions/cache.sh
+++ b/functions/cache.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# cache.sh - manage package cache
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Restore_cache ()
 {
diff --git a/functions/chroot.sh b/functions/chroot.sh
index 1ef64061a..77d777a80 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# chroot.sh - /usr/sbin/chroot wrapper script
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Chroot ()
 {
diff --git a/functions/color.sh b/functions/color.sh
index b90225365..9bdd8371d 100755
--- a/functions/color.sh
+++ b/functions/color.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# color.sh - define color values
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 NO_COLOR="\033[0m"
 
diff --git a/functions/common.sh b/functions/common.sh
index 7d3331028..2f95fe4c2 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-# common.sh - common things for all live-helpers
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-PROGRAM="$(basename ${0})"
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
+
 PACKAGE="live-helper"
 VERSION="2.0~a23-1"
 CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
diff --git a/functions/conffile.sh b/functions/conffile.sh
index 5cc7c0511..c08d3469a 100755
--- a/functions/conffile.sh
+++ b/functions/conffile.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# conffile.sh - handle configuration files
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Get_conffiles ()
 {
diff --git a/functions/cursor.sh b/functions/cursor.sh
index 2c38acd14..6ea1d9a9e 100755
--- a/functions/cursor.sh
+++ b/functions/cursor.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# cursor.sh - define cursor movements
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Cursor_goto_position ()
 {
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 458ee3598..edb9ca25f 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# defaults.sh - handle default values
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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_defaults ()
 {
diff --git a/functions/echo.sh b/functions/echo.sh
index 8cef281b1..0d8147ac2 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# echo.sh - define output methods
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Echo ()
 {
diff --git a/functions/exit.sh b/functions/exit.sh
index 338f28516..5fa1fa86f 100755
--- a/functions/exit.sh
+++ b/functions/exit.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# exit.sh - cleanup
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Exit ()
 {
diff --git a/functions/help.sh b/functions/help.sh
index 495a12bad..0bb9883ea 100755
--- a/functions/help.sh
+++ b/functions/help.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# help.sh - print help information
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Help ()
 {
diff --git a/functions/l10n.sh b/functions/l10n.sh
index 95de36d7c..d32106b69 100755
--- a/functions/l10n.sh
+++ b/functions/l10n.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# l10n.sh - load the needed localization things for all lh messages
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 if [ -x "$(which gettext.sh 2>/dev/null)" ] && Find_files /usr/share/locale/*/LC_MESSAGES/${PACKAGE}.mo
 then
diff --git a/functions/lockfile.sh b/functions/lockfile.sh
index 3cf215ac1..ea551743f 100755
--- a/functions/lockfile.sh
+++ b/functions/lockfile.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lockfile.sh - handle lock files
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Check_lockfile ()
 {
diff --git a/functions/losetup.sh b/functions/losetup.sh
index 738ce0a6c..cb9eeed43 100755
--- a/functions/losetup.sh
+++ b/functions/losetup.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# losetup - wrapper around losetup
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Losetup ()
 {
diff --git a/functions/man.sh b/functions/man.sh
index c01cf1b5a..672ed7bc3 100755
--- a/functions/man.sh
+++ b/functions/man.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# man.sh - print man information
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Man ()
 {
diff --git a/functions/packages.sh b/functions/packages.sh
index 4b833ce53..8d7953230 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# packages.sh - handle packages installation
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Check_package ()
 {
diff --git a/functions/packageslists.sh b/functions/packageslists.sh
index 08b388070..6510d27a6 100755
--- a/functions/packageslists.sh
+++ b/functions/packageslists.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# packagelists.sh - expands package list includes
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Expand_packagelist ()
 {
diff --git a/functions/releases.sh b/functions/releases.sh
index cdb2c8d29..910539484 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# releases.sh - list release information
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 # Debian releases
 RELEASE_lenny="5.0.3"
diff --git a/functions/stagefile.sh b/functions/stagefile.sh
index 530c91b60..504b6234a 100755
--- a/functions/stagefile.sh
+++ b/functions/stagefile.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# stagefile.sh - handle stage files
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Check_stagefile ()
 {
diff --git a/functions/templates.sh b/functions/templates.sh
index 782de8baa..dd774c5c7 100755
--- a/functions/templates.sh
+++ b/functions/templates.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# templates.sh - handle templates files
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Check_templates ()
 {
diff --git a/functions/usage.sh b/functions/usage.sh
index 1e6e2bf7c..ef82babee 100755
--- a/functions/usage.sh
+++ b/functions/usage.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# usage.sh - print usage information
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Usage ()
 {
diff --git a/functions/version.sh b/functions/version.sh
index 350e6b4df..62c88584c 100755
--- a/functions/version.sh
+++ b/functions/version.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# version.sh - print version information
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Version ()
 {
diff --git a/functions/wrapper.sh b/functions/wrapper.sh
index 2175f5faa..a856756d7 100755
--- a/functions/wrapper.sh
+++ b/functions/wrapper.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# wrapper.sh - external command wrappers
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 Apt ()
 {
diff --git a/hooks/minimal b/hooks/minimal
index 33f3cce7d..a33c006d1 100755
--- a/hooks/minimal
+++ b/hooks/minimal
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# /usr/share/live/build/hooks/minimal - hook list for live-helper(7)
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/hooks/stripped b/hooks/stripped
index 8463124ba..ac895da45 100755
--- a/hooks/stripped
+++ b/hooks/stripped
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# /usr/share/live/build/hooks/stripped - hook list for live-helper(7)
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary b/scripts/build/binary
index 33c2f5cac..4a29040b7 100755
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary(1) - build binary images
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums
index 5ad6ad024..17f24d550 100755
--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_checksums(1) - create binary checksums
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_chroot b/scripts/build/binary_chroot
index 1ed51e073..717d11d7c 100755
--- a/scripts/build/binary_chroot
+++ b/scripts/build/binary_chroot
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_chroot(1) - copy chroot into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index a02efde68..4f778731c 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_debian-installer(1) - install debian-installer into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index 4e28d9dd2..ec33d192e 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_disk (1) - install disk information into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_encryption b/scripts/build/binary_encryption
index 2fd2c062f..02732fa76 100755
--- a/scripts/build/binary_encryption
+++ b/scripts/build/binary_encryption
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_encryption(1) - encrypts rootfs
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
index 2c441cedc..f9505d597 100755
--- a/scripts/build/binary_grub
+++ b/scripts/build/binary_grub
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_grub(1) - installs grub into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
index b6233013e..34853bf25 100755
--- a/scripts/build/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_grub2(1) - installs grub2 into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes
index e80980eed..8648f6487 100755
--- a/scripts/build/binary_includes
+++ b/scripts/build/binary_includes
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_includes(1) - copy files into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index a8e45036f..6e054280a 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_iso(1) - build iso binary image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
index 5552d4dde..70dd60b42 100755
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_linux-image(1) - install linux-image into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_local-hooks b/scripts/build/binary_local-hooks
index 68d86ba4e..d9da52846 100755
--- a/scripts/build/binary_local-hooks
+++ b/scripts/build/binary_local-hooks
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_local-hooks(1) - execute local hooks in binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_local-includes b/scripts/build/binary_local-includes
index aaf0eea68..aa645e9f1 100755
--- a/scripts/build/binary_local-includes
+++ b/scripts/build/binary_local-includes
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_local-includes(1) - copy files into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_local-packageslists b/scripts/build/binary_local-packageslists
index b77bfa679..9fc13e664 100755
--- a/scripts/build/binary_local-packageslists
+++ b/scripts/build/binary_local-packageslists
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_local-packageslists(1) - install local packages lists into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest
index 117481767..126931a8c 100755
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_manifest(1) - create manifest
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index a6a9ab775..1aec885e0 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_memtest(1) - installs a memtest into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_net b/scripts/build/binary_net
index d401f9c60..33cbb10d8 100755
--- a/scripts/build/binary_net
+++ b/scripts/build/binary_net
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_net(1) - build netboot binary image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index a07563e67..750bc7363 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_rootfs(1) - build rootfs image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_silo b/scripts/build/binary_silo
index b76ef2a62..293066bb9 100755
--- a/scripts/build/binary_silo
+++ b/scripts/build/binary_silo
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_silo(1) - installs silo into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 698da62c1..5379c50e7 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_syslinux(1) - installs syslinux into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar
index 5d8106c56..197ceb7ef 100755
--- a/scripts/build/binary_tar
+++ b/scripts/build/binary_tar
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_tar(1) - build harddisk binary image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_usb b/scripts/build/binary_usb
index 19a6a7e70..956043988 100755
--- a/scripts/build/binary_usb
+++ b/scripts/build/binary_usb
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_usb(1) - build binary usb image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_virtual-hdd b/scripts/build/binary_virtual-hdd
index 45238d96b..4d16588a8 100755
--- a/scripts/build/binary_virtual-hdd
+++ b/scripts/build/binary_virtual-hdd
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_virtual-hdd(1) - build binary virtual-hdd image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 82b8cdb05..3a17dbdda 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_win32-loader(1) - copy win32-loader into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot
index 49bcc2d85..98cab4313 100755
--- a/scripts/build/binary_yaboot
+++ b/scripts/build/binary_yaboot
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_binary_yaboot(1) - installs yaboot into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap
index 3e267e231..63a53c5b4 100755
--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_bootstrap(1) - bootstrap a Debian system
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/bootstrap_cache b/scripts/build/bootstrap_cache
index 22e34aad7..af902df4e 100755
--- a/scripts/build/bootstrap_cache
+++ b/scripts/build/bootstrap_cache
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_bootstrap_cache(1) - cach bootstrap stage
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap
index bf879c488..79eab6259 100755
--- a/scripts/build/bootstrap_cdebootstrap
+++ b/scripts/build/bootstrap_cdebootstrap
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_bootstrap_cdebootstrap(1) - bootstrap a Debian system with cdebootstrap(1)
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/bootstrap_copy b/scripts/build/bootstrap_copy
index 3940d3f7f..fcf7c4ae1 100755
--- a/scripts/build/bootstrap_copy
+++ b/scripts/build/bootstrap_copy
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_bootstrap_copy(1) - bootstrap by copying the host system
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index 45d956f84..85e9c9bdd 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_bootstrap_debootstrap(1) - bootstrap a Debian system with debootstrap(8)
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/build b/scripts/build/build
index c9abacca8..bba847ae8 100755
--- a/scripts/build/build
+++ b/scripts/build/build
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_build(1) - build a Debian Live system
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot b/scripts/build/chroot
index abb69c6ff..20b8decfe 100755
--- a/scripts/build/chroot
+++ b/scripts/build/chroot
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot(1) - customize the Debian system
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt
index 9a97c3719..8ca2ad5ca 100755
--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_apt(1) - manage /etc/apt/apt.conf
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_cache b/scripts/build/chroot_cache
index a815105dc..411970516 100755
--- a/scripts/build/chroot_cache
+++ b/scripts/build/chroot_cache
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_cache(1) - cach chroot stage
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_debianchroot b/scripts/build/chroot_debianchroot
index df87e2a32..ef5a52517 100755
--- a/scripts/build/chroot_debianchroot
+++ b/scripts/build/chroot_debianchroot
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_debianchroot(1) - manage /etc/debian_chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts
index 778c95956..5703b34fc 100755
--- a/scripts/build/chroot_devpts
+++ b/scripts/build/chroot_devpts
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_devpts(1) - mount /dev/pts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg
index 7b01c65f2..78fc0fb67 100755
--- a/scripts/build/chroot_dpkg
+++ b/scripts/build/chroot_dpkg
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_dpkg(1) - manage /sbin/dpkg
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_dpkg_tmpfs b/scripts/build/chroot_dpkg_tmpfs
index 965a699d7..2a9567ccd 100755
--- a/scripts/build/chroot_dpkg_tmpfs
+++ b/scripts/build/chroot_dpkg_tmpfs
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_dpkg_tmpfs(1) - manage tmpfs for /var/lib/dpkg
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index e07bea99b..0156cd9a2 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_hacks(1) - execute hacks in chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_hooks b/scripts/build/chroot_hooks
index f5bce989f..14a99f7ac 100755
--- a/scripts/build/chroot_hooks
+++ b/scripts/build/chroot_hooks
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_hooks(1) - execute hooks in chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_hostname b/scripts/build/chroot_hostname
index 11a3200cf..5389e71d5 100755
--- a/scripts/build/chroot_hostname
+++ b/scripts/build/chroot_hostname
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_hostname(1) - manage /bin/hostname
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_hosts b/scripts/build/chroot_hosts
index 451c3aa58..4a8f4587b 100755
--- a/scripts/build/chroot_hosts
+++ b/scripts/build/chroot_hosts
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_hosts(1) - manage /etc/hosts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_install-packages b/scripts/build/chroot_install-packages
index 6a6fb1e7e..96df6adac 100755
--- a/scripts/build/chroot_install-packages
+++ b/scripts/build/chroot_install-packages
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_install-packages(1) - install queued packages into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_interactive b/scripts/build/chroot_interactive
index df4174936..398f2f1f1 100755
--- a/scripts/build/chroot_interactive
+++ b/scripts/build/chroot_interactive
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_interactive(1) - make build interactive
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index 22183ea55..d67107dfe 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_linux-image(1) - manage /etc/kernel-img.conf
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_local-hooks b/scripts/build/chroot_local-hooks
index ebaff3104..25e5af359 100755
--- a/scripts/build/chroot_local-hooks
+++ b/scripts/build/chroot_local-hooks
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_local-hooks(1) - execute local hooks in chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_local-includes b/scripts/build/chroot_local-includes
index d032c9431..9f2fdbe93 100755
--- a/scripts/build/chroot_local-includes
+++ b/scripts/build/chroot_local-includes
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_local-includes(1) - copy local files into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_local-packages b/scripts/build/chroot_local-packages
index 192626f8f..4e95a23f2 100755
--- a/scripts/build/chroot_local-packages
+++ b/scripts/build/chroot_local-packages
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_local-packages(1) - queue install of local packages into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_local-packageslists b/scripts/build/chroot_local-packageslists
index faffea2d8..9efc5ef1c 100755
--- a/scripts/build/chroot_local-packageslists
+++ b/scripts/build/chroot_local-packageslists
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_local-packageslists(1) - queue install of local packages lists into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_local-patches b/scripts/build/chroot_local-patches
index 9dccda6e0..c0393115e 100755
--- a/scripts/build/chroot_local-patches
+++ b/scripts/build/chroot_local-patches
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_local-patches(1) - apply local patches against chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_local-preseed b/scripts/build/chroot_local-preseed
index 86884ce86..34f9b0a9a 100755
--- a/scripts/build/chroot_local-preseed
+++ b/scripts/build/chroot_local-preseed
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_local-preseed(1) - use debconf local preseeding file
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_localization b/scripts/build/chroot_localization
index 8c14b76f1..1a1dcf811 100755
--- a/scripts/build/chroot_localization
+++ b/scripts/build/chroot_localization
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_localization(1) - install localization packages into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_packages b/scripts/build/chroot_packages
index 61683b698..4ee477c4e 100755
--- a/scripts/build/chroot_packages
+++ b/scripts/build/chroot_packages
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_packages(1) - queue install of packages into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_packageslists b/scripts/build/chroot_packageslists
index e69f446c2..9c3ca7eb8 100755
--- a/scripts/build/chroot_packageslists
+++ b/scripts/build/chroot_packageslists
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_packageslists(1) - queue install of packages lists into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed
index 49be4520e..52822a97d 100755
--- a/scripts/build/chroot_preseed
+++ b/scripts/build/chroot_preseed
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_preseed(1) - use debconf preseeding file
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc
index df7b6f53b..1279fb979 100755
--- a/scripts/build/chroot_proc
+++ b/scripts/build/chroot_proc
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_proc(1) - mount /proc
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv
index b5a7d328a..10c638568 100755
--- a/scripts/build/chroot_resolv
+++ b/scripts/build/chroot_resolv
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_resolv(1) - manage /etc/resolv.conf
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs
index 0ec2a7d4b..4b98b123c 100755
--- a/scripts/build/chroot_selinuxfs
+++ b/scripts/build/chroot_selinuxfs
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_sysfs(1) - mount /selinux
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_sources b/scripts/build/chroot_sources
index c8ed480be..b363cbb70 100755
--- a/scripts/build/chroot_sources
+++ b/scripts/build/chroot_sources
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_sources(1) - manage /etc/apt/sources.list
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_symlinks b/scripts/build/chroot_symlinks
index 703172c44..4bceaae51 100755
--- a/scripts/build/chroot_symlinks
+++ b/scripts/build/chroot_symlinks
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_symlinks(1) - convert symlinks
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_sysfs b/scripts/build/chroot_sysfs
index ef9d2ec30..c20eec6e7 100755
--- a/scripts/build/chroot_sysfs
+++ b/scripts/build/chroot_sysfs
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_sysfs(1) - mount /sys
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_sysv-rc b/scripts/build/chroot_sysv-rc
index 5c844a906..a61ddc2ce 100755
--- a/scripts/build/chroot_sysv-rc
+++ b/scripts/build/chroot_sysv-rc
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_sysv-rc(1) - manage /usr/sbin/policy-rc.d
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_sysvinit b/scripts/build/chroot_sysvinit
index e61d42bb8..0909d2be5 100755
--- a/scripts/build/chroot_sysvinit
+++ b/scripts/build/chroot_sysvinit
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_sysvinit(1) - configure sysvinit
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_tasks b/scripts/build/chroot_tasks
index a1626aa1e..83abb1db8 100755
--- a/scripts/build/chroot_tasks
+++ b/scripts/build/chroot_tasks
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_tasks(1) - install tasks into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/chroot_upstart b/scripts/build/chroot_upstart
index 3493cdde1..802de5e39 100755
--- a/scripts/build/chroot_upstart
+++ b/scripts/build/chroot_upstart
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_chroot_upstart(1) - manage /usr/sbin/initctl
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/clean b/scripts/build/clean
index 76a14cb7e..280de865c 100755
--- a/scripts/build/clean
+++ b/scripts/build/clean
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_clean(1) - clean up system build directories
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/config b/scripts/build/config
index 4d37f4431..3daed5f90 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_config(1) - create configuration for live-helper(7)
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/lb b/scripts/build/lb
new file mode 100755
index 000000000..77618023e
--- /dev/null
+++ b/scripts/build/lb
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
+HELP="FIXME"
+USAGE="FIXME"
+
+case "${1}" in
+	-h|--help)
+		if [ -x "$(which man 2>/dev/null)" ]
+		then
+			man lh
+			exit 0
+		else
+			${0} --usage
+			exit 0
+		fi
+		;;
+
+	""|-u|--usage)
+		Usage
+		;;
+
+	-v|--version)
+		Version
+		;;
+
+	*)
+		COMMAND="${1}"
+		shift
+
+		if [ -x "${LH_BASE}/scripts/build/${COMMAND}" ]
+		then
+			LH=1 exec "${LH_BASE}/scripts/build/${COMMAND}" "${@}"
+		elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ]
+		then
+			LH=1 exec /usr/share/live/build/scripts/build/"${COMMAND}" "${@}"
+		elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
+		then
+			LH=1 exec "${COMMAND}" "${@}"
+		else
+			Echo_error "no such script"
+			exit 1
+		fi
+		;;
+esac
diff --git a/scripts/build/lh b/scripts/build/lh
index 13419580f..77618023e 100755
--- a/scripts/build/lh
+++ b/scripts/build/lh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh(1) - generic live-helper wrapper
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/live-build b/scripts/build/live-build
new file mode 100755
index 000000000..41f0578ae
--- /dev/null
+++ b/scripts/build/live-build
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see <http://www.gnu.org/licenses/>.
+##
+## On Debian systems, the complete text of the GNU General Public License
+## can be found in /usr/share/common-licenses/GPL-3 file.
+
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+
+if [ -x "$(which man 2>/dev/null)" ]
+then
+	man live-build
+	exit 0
+else
+	Echo "live-build is a set of scripts to build Debian Live system images."
+	echo
+	Echo "The idea behind live-build is a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image."
+	echo
+	Echo "An introduction to live-build can be found in the live-build(7) manpage."
+	exit 0
+fi
diff --git a/scripts/build/live-helper b/scripts/build/live-helper
index 6e7163a60..4341a16e5 100755
--- a/scripts/build/live-helper
+++ b/scripts/build/live-helper
@@ -1,23 +1,24 @@
 #!/bin/sh
 
-# live-helper(7) - the Debian Live tool suite
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL-3 file.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see <http://www.gnu.org/licenses/>.
+##
+## On Debian systems, the complete text of the GNU General Public License
+## can be found in /usr/share/common-licenses/GPL-3 file.
+
 
 set -e
 
diff --git a/scripts/build/local b/scripts/build/local
index 39ba6a7fd..7ede8be7b 100755
--- a/scripts/build/local
+++ b/scripts/build/local
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_local(1) - use a local live-helper version
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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.
+
 
 LH_BASE="${PWD}/live-helper"
 PATH="${LH_BASE}/helpers:${PATH}"
diff --git a/scripts/build/source b/scripts/build/source
index 6a4004b81..c64265a08 100755
--- a/scripts/build/source
+++ b/scripts/build/source
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_source(1) - build source images
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums
index 2247c8192..092f266b5 100755
--- a/scripts/build/source_checksums
+++ b/scripts/build/source_checksums
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_source_checksums(1) - create source checksums
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index 1f578affe..da58fd17d 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_source_debian(1) - download sources
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/source_debian-live b/scripts/build/source_debian-live
index 4751ac72b..92f364a72 100755
--- a/scripts/build/source_debian-live
+++ b/scripts/build/source_debian-live
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_source_debian-live(1) - copy debian-live config into source
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
index 75ff0d6bf..a915e8666 100755
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_source_disk (1) - install disk information into source
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/source_iso b/scripts/build/source_iso
index af2976cc7..d159cd12e 100755
--- a/scripts/build/source_iso
+++ b/scripts/build/source_iso
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_source_iso(1) - build iso source image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/source_net b/scripts/build/source_net
index a9e653bae..cf47abc26 100755
--- a/scripts/build/source_net
+++ b/scripts/build/source_net
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_source_net(1) - build source net image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/source_tar b/scripts/build/source_tar
index d21ad9c5c..cd0f39896 100755
--- a/scripts/build/source_tar
+++ b/scripts/build/source_tar
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_source_tar(1) - build source tarball
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/source_usb b/scripts/build/source_usb
index ca352fdec..219482eec 100755
--- a/scripts/build/source_usb
+++ b/scripts/build/source_usb
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_source_usb(1) - build source usb image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/source_virtual-hdd b/scripts/build/source_virtual-hdd
index e42901171..8434468c8 100755
--- a/scripts/build/source_virtual-hdd
+++ b/scripts/build/source_virtual-hdd
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_source_virtual-hdd(1) - build source virtual-hdd image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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
 
diff --git a/scripts/build/testroot b/scripts/build/testroot
index d79735102..7a6799925 100755
--- a/scripts/build/testroot
+++ b/scripts/build/testroot
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# lh_testroot(1) - ensure that a system is built as root
-# Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
+##
+## live-build 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