Removing all references to my old email address.

147 files changed, 674 insertions, 674 deletions

diff --git a/bin/lb b/bin/lb
index d79a62cfd..568b21b20 100755
--- a/bin/lb
+++ b/bin/lb
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/bin/live-build b/bin/live-build
index bd5d560d7..88d11df19 100755
--- a/bin/live-build
+++ b/bin/live-build
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## 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
diff --git a/debian/changelog b/debian/changelog
index 30b73b052..bbf1ac3e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,7 @@ live-build (4.0~a14-1) experimental; urgency=low
   [ Raphaël Hertzog ]
   * Fixing win32-loader.ini by including the GTK related entries.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 10 Mar 2013 19:06:14 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 10 Mar 2013 19:06:14 +0100
 
 live-build (4.0~a13-1) experimental; urgency=low
 
@@ -41,7 +41,7 @@ live-build (4.0~a13-1) experimental; urgency=low
   * Adding source_hooks for hooks on source images like already supported
     on binary images.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 21 Feb 2013 23:29:53 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 21 Feb 2013 23:29:53 +0100
 
 live-build (4.0~a12-1) experimental; urgency=low
 
@@ -55,7 +55,7 @@ live-build (4.0~a12-1) experimental; urgency=low
   * Synchronise grub and grub2 splashes with internal live-build splash
     for syslinux bootloaders.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 18 Feb 2013 21:49:32 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 18 Feb 2013 21:49:32 +0100
 
 live-build (4.0~a11-1) experimental; urgency=low
 
@@ -67,7 +67,7 @@ live-build (4.0~a11-1) experimental; urgency=low
   * Dropping powerpc bootloader support (yaboot), there is nobody actively
     maintaining this in live-build.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 15 Feb 2013 12:39:09 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 15 Feb 2013 12:39:09 +0100
 
 live-build (4.0~a10-1) experimental; urgency=low
 
@@ -76,7 +76,7 @@ live-build (4.0~a10-1) experimental; urgency=low
   * Updating wheezy release number.
   * Adding 3.0.1-1 changelog entries.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 15 Feb 2013 09:00:52 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 15 Feb 2013 09:00:52 +0100
 
 live-build (4.0~a9-1) experimental; urgency=low
 
@@ -110,7 +110,7 @@ live-build (4.0~a9-1) experimental; urgency=low
   * Removing dropped syslinux-theme config option from lb_config manpage.
   * Adding 3.0.0-1 changelog entries.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 09 Feb 2013 00:23:47 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 09 Feb 2013 00:23:47 +0100
 
 live-build (4.0~a8-1) experimental; urgency=low
 
@@ -150,7 +150,7 @@ live-build (4.0~a8-1) experimental; urgency=low
   * Avoiding to unconditionally adding whitespace separator to
     config/control for existing configs.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 20 Jan 2013 11:28:27 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 20 Jan 2013 11:28:27 +0100
 
 live-build (4.0~a7-1) experimental; urgency=low
 
@@ -193,7 +193,7 @@ live-build (4.0~a7-1) experimental; urgency=low
   * Dropping pre-wheezy handling for win32-loader files.
   * Adding 3.0~b5-1 changelog entries.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 02 Jan 2013 11:50:55 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 02 Jan 2013 11:50:55 +0100
 
 live-build (4.0~a6-1) experimental; urgency=low
 
@@ -235,7 +235,7 @@ live-build (4.0~a6-1) experimental; urgency=low
   * Removing pre-wheezy grub package from binary_debian-installer.
   * Adding 3.0~b4-1 changelog entries.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 23 Dec 2012 10:54:24 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 23 Dec 2012 10:54:24 +0100
 
 live-build (4.0~a5-1) experimental; urgency=low
 
@@ -259,7 +259,7 @@ live-build (4.0~a5-1) experimental; urgency=low
     mode.
   * Adding 3.0~b3-1 changelog entries.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 17 Dec 2012 20:32:41 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 17 Dec 2012 20:32:41 +0100
 
 live-build (4.0~a4-1) experimental; urgency=low
 
@@ -281,7 +281,7 @@ live-build (4.0~a4-1) experimental; urgency=low
   * Switching from genisoimage to xorriso.
   * Adding 3.0~b2-1 changelog entries.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 16 Dec 2012 22:01:58 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 16 Dec 2012 22:01:58 +0100
 
 live-build (4.0~a3-1) experimental; urgency=low
 
@@ -293,7 +293,7 @@ live-build (4.0~a3-1) experimental; urgency=low
   * Skipping creation of soon to be replaced config/templates directory.
   * Adding 3.0~b1-1 changelog entries.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 10 Dec 2012 20:40:05 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 10 Dec 2012 20:40:05 +0100
 
 live-build (4.0~a2-1) experimental; urgency=low
 
@@ -313,13 +313,13 @@ live-build (4.0~a2-1) experimental; urgency=low
     firmware inclusion in ubuntu mode anyway.
   * Adding 3.0~a69-1 changelog entries.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 06 Dec 2012 21:17:32 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 06 Dec 2012 21:17:32 +0100
 
 live-build (4.0~a1-1) experimental; urgency=low
 
   * Dropping support for squeeze and squeeze-based distributions.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 30 Nov 2012 15:22:32 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 30 Nov 2012 15:22:32 +0100
 
 live-build (3.0.1-1) unstable; urgency=low
 
@@ -329,7 +329,7 @@ live-build (3.0.1-1) unstable; urgency=low
   * Updating squeeze point-release number.
   * Dropping German manpage translations stubs for the release.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 14 Feb 2013 19:31:04 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 14 Feb 2013 19:31:04 +0100
 
 live-build (3.0.0-1) unstable; urgency=low
 
@@ -362,7 +362,7 @@ live-build (3.0.0-1) unstable; urgency=low
     bootsplashes.
   * Removing dropped syslinux-theme config option from lb_config manpage.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 09 Feb 2013 00:18:07 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 09 Feb 2013 00:18:07 +0100
 
 live-build (3.0~b6-1) unstable; urgency=low
 
@@ -398,7 +398,7 @@ live-build (3.0~b6-1) unstable; urgency=low
     debian-installer with live-installer and having firmware packages
     installed in the live system already.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 20 Jan 2013 10:17:42 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 20 Jan 2013 10:17:42 +0100
 
 live-build (3.0~b5-1) unstable; urgency=low
 
@@ -437,7 +437,7 @@ live-build (3.0~b5-1) unstable; urgency=low
   * Adding support for sha512 checksums.
   * Dropping pre-squeeze handling for win32-loader files.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 02 Jan 2013 11:45:30 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 02 Jan 2013 11:45:30 +0100
 
 live-build (3.0~b4-1) unstable; urgency=low
 
@@ -453,7 +453,7 @@ live-build (3.0~b4-1) unstable; urgency=low
   [ Daniel Baumann ]
   * Removing grub package from binary_debian-installer for wheezy.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 23 Dec 2012 10:50:38 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 23 Dec 2012 10:50:38 +0100
 
 live-build (3.0~b3-1) unstable; urgency=low
 
@@ -476,7 +476,7 @@ live-build (3.0~b3-1) unstable; urgency=low
   * Removing kubuntu mode, it's not different anymore to standard ubuntu
     mode.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 17 Dec 2012 20:29:56 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 17 Dec 2012 20:29:56 +0100
 
 live-build (3.0~b2-1) unstable; urgency=low
 
@@ -497,7 +497,7 @@ live-build (3.0~b2-1) unstable; urgency=low
   [ Daniel Baumann ]
   * Switching from genisoimage to xorriso.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 16 Dec 2012 21:57:11 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 16 Dec 2012 21:57:11 +0100
 
 live-build (3.0~b1-1) unstable; urgency=low
 
@@ -508,7 +508,7 @@ live-build (3.0~b1-1) unstable; urgency=low
   * Removing local/bin by default in lb_clean too.
   * Skipping creation of soon to be replaced config/templates directory.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 10 Dec 2012 20:38:58 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 10 Dec 2012 20:38:58 +0100
 
 live-build (3.0~a69-1) unstable; urgency=low
 
@@ -531,7 +531,7 @@ live-build (3.0~a69-1) unstable; urgency=low
   * Adding back legacy filtering for firmware packages on squeeze when
     contrib or non-free is not enabled.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 06 Dec 2012 21:09:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 06 Dec 2012 21:09:00 +0100
 
 live-build (3.0~a68-1) unstable; urgency=low
 
@@ -576,7 +576,7 @@ live-build (3.0~a68-1) unstable; urgency=low
   * Replicating same qemu support within bootstrap_debootstrao for
     bootstrap_cdebootstrap too (Closes: #694102).
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 30 Nov 2012 15:09:48 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 30 Nov 2012 15:09:48 +0100
 
 live-build (3.0~a67-1) unstable; urgency=low
 
@@ -615,7 +615,7 @@ live-build (3.0~a67-1) unstable; urgency=low
   * Workarounding recent archive changes wrt/ content files until
     #692111 is fixed.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 02 Nov 2012 12:23:38 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 02 Nov 2012 12:23:38 +0100
 
 live-build (3.0~a66-1) unstable; urgency=low
 
@@ -642,7 +642,7 @@ live-build (3.0~a66-1) unstable; urgency=low
   * Renaming config/includes.binary_debian-installer to simply
     config/includes.debian-installer.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 22 Oct 2012 20:44:44 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 22 Oct 2012 20:44:44 +0200
 
 live-build (3.0~a65-1) unstable; urgency=low
 
@@ -655,7 +655,7 @@ live-build (3.0~a65-1) unstable; urgency=low
   * Correcting variable handling for --bootappend-live-failsafe in
     defaults.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 08 Oct 2012 20:47:02 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 08 Oct 2012 20:47:02 +0200
 
 live-build (3.0~a64-1) unstable; urgency=low
 
@@ -678,7 +678,7 @@ live-build (3.0~a64-1) unstable; urgency=low
     file systems (squashfs), there is no point in further compressing
     the tarballs and images.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 05 Oct 2012 09:23:12 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 05 Oct 2012 09:23:12 +0200
 
 live-build (3.0~a63-1) unstable; urgency=low
 
@@ -686,7 +686,7 @@ live-build (3.0~a63-1) unstable; urgency=low
     files.
   * Booting by default with 'quiet' and 'splash' parameters.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 02 Oct 2012 21:24:22 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 02 Oct 2012 21:24:22 +0200
 
 live-build (3.0~a62-1) unstable; urgency=low
 
@@ -711,7 +711,7 @@ live-build (3.0~a62-1) unstable; urgency=low
   * Using menu default only once when populating syslinux configurations
     for more than one kernel flavour (Closes: #682957).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 01 Oct 2012 05:02:08 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 01 Oct 2012 05:02:08 +0200
 
 live-build (3.0~a61-1) unstable; urgency=low
 
@@ -742,7 +742,7 @@ live-build (3.0~a61-1) unstable; urgency=low
   * Adding slightly modified patch from Adam Conrad
     <adconrad@ubuntu.com> to remove resolvconf artifacts.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 30 Sep 2012 09:46:53 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 30 Sep 2012 09:46:53 +0200
 
 live-build (3.0~a60-1) unstable; urgency=low
 
@@ -755,7 +755,7 @@ live-build (3.0~a60-1) unstable; urgency=low
   * Including loadlin on d-i images on amd64 and i386.
   * Updating to standards version 3.9.4.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 29 Sep 2012 14:08:42 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 29 Sep 2012 14:08:42 +0200
 
 live-build (3.0~a59-1) unstable; urgency=low
 
@@ -775,7 +775,7 @@ live-build (3.0~a59-1) unstable; urgency=low
   * Removing intel-microcode special handling in chroot_linux-image,
     microcode packages are already included automatically anyway.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 26 Sep 2012 14:48:30 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 26 Sep 2012 14:48:30 +0200
 
 live-build (3.0~a58-1) unstable; urgency=low
 
@@ -834,7 +834,7 @@ live-build (3.0~a58-1) unstable; urgency=low
   * Dropping lb prefix from live-build scripts, not needed anymore.
   * Setting default progress distribution from artax to baureo.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 27 Aug 2012 16:33:10 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 27 Aug 2012 16:33:10 +0200
 
 live-build (3.0~a57-1) unstable; urgency=low
 
@@ -855,7 +855,7 @@ live-build (3.0~a57-1) unstable; urgency=low
   * Adding live-build to depends for live-build-cgi.
   * Adding cron to recommends for live-build-cgi.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 10 Aug 2012 22:42:17 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 10 Aug 2012 22:42:17 +0200
 
 live-build (3.0~a56-1) unstable; urgency=low
 
@@ -873,7 +873,7 @@ live-build (3.0~a56-1) unstable; urgency=low
     anyway.
   * Disabling volatile for wheezy for the time being.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 30 Jul 2012 21:55:32 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 30 Jul 2012 21:55:32 +0200
 
 live-build (3.0~a55-1) unstable; urgency=low
 
@@ -910,7 +910,7 @@ live-build (3.0~a55-1) unstable; urgency=low
   * Optimizing chroot package-lists handling for the cases where it's
     not used.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 29 Jul 2012 01:59:42 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 29 Jul 2012 01:59:42 +0200
 
 live-build (3.0~a54-1) unstable; urgency=low
 
@@ -921,7 +921,7 @@ live-build (3.0~a54-1) unstable; urgency=low
   * Correcting accidentally reverted check for rsvg in binary_syslinux
     when building non-chrooted.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 20 Jul 2012 04:36:21 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 20 Jul 2012 04:36:21 +0200
 
 live-build (3.0~a53-1) unstable; urgency=low
 
@@ -969,7 +969,7 @@ live-build (3.0~a53-1) unstable; urgency=low
   * Correcting spelling typo in 3.0~a52-1 changelog entry.
   * Removing leftover maintainer scripts from cron removals.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 19 Jul 2012 04:14:38 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 19 Jul 2012 04:14:38 +0200
 
 live-build (3.0~a52-1) unstable; urgency=low
 
@@ -1019,7 +1019,7 @@ live-build (3.0~a52-1) unstable; urgency=low
     derivatives compliant.
   * Enabling security archives on wheezy.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 18 Jul 2012 22:46:55 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 18 Jul 2012 22:46:55 +0200
 
 live-build (3.0~a51-1) unstable; urgency=low
 
@@ -1038,7 +1038,7 @@ live-build (3.0~a51-1) unstable; urgency=low
   * Switching from smbfs to cifs-utils (Closes: #679240).
   * Switching to xz compression in source and binary packages.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 27 Jun 2012 14:38:21 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 27 Jun 2012 14:38:21 +0200
 
 live-build (3.0~a50-1) unstable; urgency=low
 
@@ -1060,7 +1060,7 @@ live-build (3.0~a50-1) unstable; urgency=low
   [ Hector Oron ]
   * Dont assume bash when configuring chroot with QEMU.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 06 Jun 2012 20:00:02 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 06 Jun 2012 20:00:02 +0200
 
 live-build (3.0~a49-1) unstable; urgency=low
 
@@ -1102,7 +1102,7 @@ live-build (3.0~a49-1) unstable; urgency=low
   * Moving local includes from auto/{functions,scripts} to
     local/{functions,scripts} where they belong.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 04 Jun 2012 12:15:37 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 04 Jun 2012 12:15:37 +0200
 
 live-build (3.0~a48-1) unstable; urgency=low
 
@@ -1123,7 +1123,7 @@ live-build (3.0~a48-1) unstable; urgency=low
   * Allowing to inject variables through config/environment.chroot into
     the chroots environment.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 25 May 2012 08:22:27 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 25 May 2012 08:22:27 +0200
 
 live-build (3.0~a47-1) unstable; urgency=low
 
@@ -1166,7 +1166,7 @@ live-build (3.0~a47-1) unstable; urgency=low
   * Adding symlinks in /firmware for debian-installer on live media.
   * Slight reordering in lb_binary_debian-installer.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 27 Apr 2012 11:37:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 27 Apr 2012 11:37:00 +0200
 
 live-build (3.0~a46-1) unstable; urgency=low
 
@@ -1212,7 +1212,7 @@ live-build (3.0~a46-1) unstable; urgency=low
   * Prefering default modules in initrd even on netboot images (Closes:
     #667594).
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 05 Apr 2012 10:32:51 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 05 Apr 2012 10:32:51 +0200
 
 live-build (3.0~a45-1) unstable; urgency=low
 
@@ -1231,7 +1231,7 @@ live-build (3.0~a45-1) unstable; urgency=low
   * Adding Polish debconf translations from Michal Kulach
     <michalkulach@gmail.com> (Closes: #660003).
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 16 Feb 2012 21:47:11 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 16 Feb 2012 21:47:11 +0100
 
 live-build (3.0~a44-1) unstable; urgency=low
 
@@ -1255,7 +1255,7 @@ live-build (3.0~a44-1) unstable; urgency=low
     configs need to use absolute symlinks on purpose to allow chrooted
     builds).
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 12 Feb 2012 22:08:49 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 12 Feb 2012 22:08:49 +0100
 
 live-build (3.0~a43-1) unstable; urgency=low
 
@@ -1303,7 +1303,7 @@ live-build (3.0~a43-1) unstable; urgency=low
   * Shortening kernel and initrd filenames in /live again similar to
     what we did with in lenny.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 06 Feb 2012 23:23:32 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 06 Feb 2012 23:23:32 +0100
 
 live-build (3.0~a42-1) unstable; urgency=low
 
@@ -1336,7 +1336,7 @@ live-build (3.0~a42-1) unstable; urgency=low
   * Adding reference to --parent-archive-areas in lb_config manpage
     (Closes: #646797).
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 15 Jan 2012 19:25:42 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 15 Jan 2012 19:25:42 +0100
 
 live-build (3.0~a41-1) unstable; urgency=low
 
@@ -1375,7 +1375,7 @@ live-build (3.0~a41-1) unstable; urgency=low
   * Adding updated Swedish debconf translations from Martin Bagge
     <brother@bsnet.se> (Closes: #651345).
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 08 Jan 2012 02:23:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 08 Jan 2012 02:23:00 +0100
 
 live-build (3.0~a40-1) unstable; urgency=low
 
@@ -1391,7 +1391,7 @@ live-build (3.0~a40-1) unstable; urgency=low
   * Adding updated French debconf translations from Julien Patriarca
     <patriarcaj@gmail.com> (Closes: #650655).
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 04 Dec 2011 10:14:06 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 04 Dec 2011 10:14:06 +0100
 
 live-build (3.0~a39-1) unstable; urgency=low
 
@@ -1425,7 +1425,7 @@ live-build (3.0~a39-1) unstable; urgency=low
     <linux@wansing-online.de> (Closes: #648381).
   * Updating and completing German debconf translations.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 14 Nov 2011 12:46:20 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 14 Nov 2011 12:46:20 +0100
 
 live-build (3.0~a38-1) unstable; urgency=low
 
@@ -1439,7 +1439,7 @@ live-build (3.0~a38-1) unstable; urgency=low
   * Adding precise in releases list.
   * Correcting defaults d-i mirror for progress.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 30 Oct 2011 08:46:54 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 30 Oct 2011 08:46:54 +0100
 
 live-build (3.0~a37-1) unstable; urgency=low
 
@@ -1447,7 +1447,7 @@ live-build (3.0~a37-1) unstable; urgency=low
     using --apt-source-archives false.
   * Correcting typo in defaults for system variable.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 13 Oct 2011 20:03:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 13 Oct 2011 20:03:00 +0200
 
 live-build (3.0~a36-1) unstable; urgency=low
 
@@ -1458,7 +1458,7 @@ live-build (3.0~a36-1) unstable; urgency=low
     #645116).
   * Deal with non-existing preseed files in config tree.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 13 Oct 2011 15:55:53 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 13 Oct 2011 15:55:53 +0200
 
 live-build (3.0~a35-1) unstable; urgency=low
 
@@ -1485,7 +1485,7 @@ live-build (3.0~a35-1) unstable; urgency=low
   * Adding Ubuntu Cloud images packages lists.
   * Adding foreign bootstrap via qemu for cross arch building.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 08 Oct 2011 10:57:04 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 08 Oct 2011 10:57:04 +0200
 
 live-build (3.0~a34-1) unstable; urgency=low
 
@@ -1520,14 +1520,14 @@ live-build (3.0~a34-1) unstable; urgency=low
   * Setting default ubuntu release to oneric.
   * Removing EOL Ubuntu dapper from release information.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 30 Sep 2011 14:50:40 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 30 Sep 2011 14:50:40 +0200
 
 live-build (3.0~a33-1) unstable; urgency=low
 
   * Correcting check for debian-installer-distribution when using daily
     images in non-derivatives mode.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 28 Sep 2011 07:33:59 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 28 Sep 2011 07:33:59 +0200
 
 live-build (3.0~a32-1) unstable; urgency=low
 
@@ -1568,7 +1568,7 @@ live-build (3.0~a32-1) unstable; urgency=low
   * Fixing left-over uses of --packages-lists in cron scripts and
     examples.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 27 Sep 2011 22:54:36 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 27 Sep 2011 22:54:36 +0200
 
 live-build (3.0~a31-1) experimental; urgency=low
 
@@ -1627,7 +1627,7 @@ live-build (3.0~a31-1) experimental; urgency=low
     chroot and binary.
   * Correcting syntax error in local package handling.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 07 Sep 2011 17:41:19 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 07 Sep 2011 17:41:19 +0200
 
 live-build (3.0~a30-1) experimental; urgency=low
 
@@ -1649,7 +1649,7 @@ live-build (3.0~a30-1) experimental; urgency=low
   * Moving removal of udev persistent rules from chroot_hacks to a hook,
     that way it can be easily skipped if desired.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 24 Aug 2011 19:37:17 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 24 Aug 2011 19:37:17 +0200
 
 live-build (3.0~a29-1) experimental; urgency=low
 
@@ -1665,7 +1665,7 @@ live-build (3.0~a29-1) experimental; urgency=low
   * Also guarding key additions for local configured archives to not
     fail if no key is supplied.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 13 Aug 2011 08:07:10 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 13 Aug 2011 08:07:10 +0200
 
 live-build (3.0~a28-1) experimental; urgency=low
 
@@ -1680,7 +1680,7 @@ live-build (3.0~a28-1) experimental; urgency=low
   * Since all (false positives for) bashisms are gone, making the test
     target fail on bashisms.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 08 Aug 2011 21:12:17 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 08 Aug 2011 21:12:17 +0200
 
 live-build (3.0~a27-1) experimental; urgency=low
 
@@ -1693,7 +1693,7 @@ live-build (3.0~a27-1) experimental; urgency=low
   * Removing left-over mentioning of lb_binary_local-hooks instead of
     lb_binary_hooks in lb_binary.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 08 Aug 2011 08:04:08 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 08 Aug 2011 08:04:08 +0200
 
 live-build (3.0~a26-1) experimental; urgency=low
 
@@ -1812,7 +1812,7 @@ live-build (3.0~a26-1) experimental; urgency=low
   * Adding missing 'set -e' in remove-python-py.chroot hook.
   * Correcting indentiation in hook defaults assignment.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 04 Aug 2011 21:51:37 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 04 Aug 2011 21:51:37 +0200
 
 live-build (3.0~a25-1) experimental; urgency=low
 
@@ -1820,7 +1820,7 @@ live-build (3.0~a25-1) experimental; urgency=low
   * Adding live-manual to recommends.
   * Adding initial live-build-cron package.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 15 Jul 2011 20:33:24 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 15 Jul 2011 20:33:24 +0200
 
 live-build (3.0~a24-1) experimental; urgency=low
 
@@ -1835,14 +1835,14 @@ live-build (3.0~a24-1) experimental; urgency=low
   * Adding live-boot-doc to recommends.
   * Adding live-config-doc to recommends.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 13 Jul 2011 10:42:29 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 13 Jul 2011 10:42:29 +0200
 
 live-build (3.0~a23-1) experimental; urgency=low
 
   * Correcting wrong chroot call in chroot_archives, only affecting
     derivatives.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 29 Jun 2011 07:58:09 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 29 Jun 2011 07:58:09 +0200
 
 live-build (3.0~a22-1) experimental; urgency=low
 
@@ -1892,7 +1892,7 @@ live-build (3.0~a22-1) experimental; urgency=low
   * Making help message about missing po4a in manpages makefile
     distribution neutral.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 29 Jun 2011 06:18:11 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 29 Jun 2011 06:18:11 +0200
 
 live-build (3.0~a21-1) unstable; urgency=low
 
@@ -1910,7 +1910,7 @@ live-build (3.0~a21-1) unstable; urgency=low
     #630350).
   * Add --initramfs-compression option (Closes: #627677).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 13 Jun 2011 20:42:13 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 13 Jun 2011 20:42:13 +0200
 
 live-build (3.0~a20-1) unstable; urgency=low
 
@@ -1948,7 +1948,7 @@ live-build (3.0~a20-1) unstable; urgency=low
     Eventually, this allows to have media containing a 'bigger' live
     system that what they end up installing (Closes: #627439).
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 11 Jun 2011 17:46:24 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 11 Jun 2011 17:46:24 +0200
 
 live-build (3.0~a19-1) unstable; urgency=low
 
@@ -1970,7 +1970,7 @@ live-build (3.0~a19-1) unstable; urgency=low
   [ Daniel Baumann ]
   * Don't try to install standard task on anything but ubuntu.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 11 Jun 2011 11:04:08 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 11 Jun 2011 11:04:08 +0200
 
 live-build (3.0~a18-1) unstable; urgency=low
 
@@ -1998,7 +1998,7 @@ live-build (3.0~a18-1) unstable; urgency=low
   * Correcting wrong task defaults.
   * Updating grub paths for d-i files (Closes: #627695).
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 03 Jun 2011 11:59:30 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 03 Jun 2011 11:59:30 +0200
 
 live-build (3.0~a17-1) unstable; urgency=low
 
@@ -2037,7 +2037,7 @@ live-build (3.0~a17-1) unstable; urgency=low
   [ liandro sg ]
   * Be more careful with subshells (Closes: #623356).
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 18 May 2011 19:49:53 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 18 May 2011 19:49:53 +0200
 
 live-build (3.0~a16-1) unstable; urgency=low
 
@@ -2049,14 +2049,14 @@ live-build (3.0~a16-1) unstable; urgency=low
     installation; the tasks should only 'fill-up' with what has not
     already been provided by packages or package lists.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 23 Apr 2011 19:27:16 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 23 Apr 2011 19:27:16 +0200
 
 live-build (3.0~a15-1) unstable; urgency=low
 
   * Adding temporary hack for progress until multistrap can be used for
     bootstrapping.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 22 Apr 2011 23:11:56 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 22 Apr 2011 23:11:56 +0200
 
 live-build (3.0~a14-1) unstable; urgency=low
 
@@ -2083,7 +2083,7 @@ live-build (3.0~a14-1) unstable; urgency=low
   * Updating security archive entries for progress.
   * Correcting repository handling for live.debian.net wrt/ derivatives.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 25 Mar 2011 09:13:52 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 25 Mar 2011 09:13:52 +0100
 
 live-build (3.0~a13-1) unstable; urgency=low
 
@@ -2100,7 +2100,7 @@ live-build (3.0~a13-1) unstable; urgency=low
   [ Daniel Baumann ]
   * Updating archive signing key for live.debian.net repository.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 09 Mar 2011 19:27:39 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 09 Mar 2011 19:27:39 +0100
 
 live-build (3.0~a12-1) experimental; urgency=low
 
@@ -2164,7 +2164,7 @@ live-build (3.0~a12-1) experimental; urgency=low
   * Correcting udeb download for derivatives to only fall back to
     debians repository if required to.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 15 Feb 2011 19:43:44 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 15 Feb 2011 19:43:44 +0100
 
 live-build (3.0~a11-1) experimental; urgency=low
 
@@ -2199,7 +2199,7 @@ live-build (3.0~a11-1) experimental; urgency=low
   * Correcting typo in lzip default options.
   * Updating compression defaults for progress.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 11 Jan 2011 13:42:17 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 11 Jan 2011 13:42:17 +0100
 
 live-build (3.0~a10-1) experimental; urgency=low
 
@@ -2226,7 +2226,7 @@ live-build (3.0~a10-1) experimental; urgency=low
   * Marking ntop as sid only in rescue list.
   * Marking tob as sid only in rescue list.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 14 Dec 2010 13:17:58 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 14 Dec 2010 13:17:58 +0100
 
 live-build (3.0~a9-1) experimental; urgency=low
 
@@ -2242,7 +2242,7 @@ live-build (3.0~a9-1) experimental; urgency=low
   [ Ben Armstrong ]
   * Updating lb config --help and man page.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 06 Dec 2010 12:19:09 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 06 Dec 2010 12:19:09 +0100
 
 live-build (3.0~a8-1) experimental; urgency=low
 
@@ -2261,7 +2261,7 @@ live-build (3.0~a8-1) experimental; urgency=low
     calls more robust.
   * Updating initramfs switch in lb config manpage (Closes: #605255).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 29 Nov 2010 23:19:28 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 29 Nov 2010 23:19:28 +0100
 
 live-build (3.0~a7-1) experimental; urgency=low
 
@@ -2284,7 +2284,7 @@ live-build (3.0~a7-1) experimental; urgency=low
   * Simplyfing ssh host key removal.
   * Adding dpkg source options file.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 22 Nov 2010 23:22:15 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 22 Nov 2010 23:22:15 +0100
 
 live-build (3.0~a6-1) experimental; urgency=low
 
@@ -2334,13 +2334,13 @@ live-build (3.0~a6-1) experimental; urgency=low
     config.
   * Making d-i indices copying depending on binary image type.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 13 Nov 2010 16:01:57 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 13 Nov 2010 16:01:57 +0100
 
 live-build (3.0~a5-1) experimental; urgency=low
 
   * Removing --binary-pool again, not ready yet.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 04 Oct 2010 18:13:53 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 04 Oct 2010 18:13:53 +0200
 
 live-build (3.0~a4-1) experimental; urgency=low
 
@@ -2361,7 +2361,7 @@ live-build (3.0~a4-1) experimental; urgency=low
   [ Daniel Baumann ]
   * Correcting typo with lb config call for usb-hdd in autobuild script.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 02 Oct 2010 10:18:16 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 02 Oct 2010 10:18:16 +0200
 
 live-build (3.0~a3-1) experimental; urgency=low
 
@@ -2374,7 +2374,7 @@ live-build (3.0~a3-1) experimental; urgency=low
   * Avoid using bashism when handling codename/suite mapping for debian-
     installer release file.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 26 Sep 2010 23:24:01 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 26 Sep 2010 23:24:01 +0200
 
 live-build (3.0~a2-1) experimental; urgency=low
 
@@ -2382,21 +2382,21 @@ live-build (3.0~a2-1) experimental; urgency=low
   * Adding option to allow using the live-media pool in live system.
   * Updating version constraints in config tree version check.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 26 Sep 2010 20:09:14 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 26 Sep 2010 20:09:14 +0200
 
 live-build (3.0~a1-1) experimental; urgency=low
 
   * Removing lenny support.
   * Switching to source format 3.0 (quilt).
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 26 Sep 2010 12:38:28 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 26 Sep 2010 12:38:28 +0200
 
 live-build (2.0.12-2) unstable; urgency=low
 
   * Adding preinst script to remove
     /usr/share/live/build/includes/squeeze (Closes: #611794).
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 02 Feb 2011 12:35:41 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 02 Feb 2011 12:35:41 +0100
 
 live-build (2.0.12-1) unstable; urgency=low
 
@@ -2439,7 +2439,7 @@ live-build (2.0.12-1) unstable; urgency=low
   * Updating syslinux theme for squeeze.
   * Removing wheezy splash.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 01 Feb 2011 22:32:56 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 01 Feb 2011 22:32:56 +0100
 
 live-build (2.0.11-1) unstable; urgency=low
 
@@ -2455,7 +2455,7 @@ live-build (2.0.11-1) unstable; urgency=low
   [ Daniel Baumann ]
   * Removing unmaintained package lists (Closes: #598100).
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 24 Dec 2010 18:49:26 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 24 Dec 2010 18:49:26 +0100
 
 live-build (2.0.10-1) unstable; urgency=low
 
@@ -2487,7 +2487,7 @@ live-build (2.0.10-1) unstable; urgency=low
   * Marking ntop as lenny and sid only in rescue list.
   * Marking tob as lenny and sid only in rescue list.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 14 Dec 2010 13:05:39 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 14 Dec 2010 13:05:39 +0100
 
 live-build (2.0.9-1) unstable; urgency=medium
 
@@ -2500,7 +2500,7 @@ live-build (2.0.9-1) unstable; urgency=medium
   [ Daniel Baumann ]
   * Unfuzzying German manpage translations.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 06 Dec 2010 12:01:43 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 06 Dec 2010 12:01:43 +0100
 
 live-build (2.0.8-1) unstable; urgency=medium
 
@@ -2517,7 +2517,7 @@ live-build (2.0.8-1) unstable; urgency=medium
     calls more robust.
   * Updating initramfs switch in lb config manpage (Closes: #605255).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 29 Nov 2010 23:12:54 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 29 Nov 2010 23:12:54 +0100
 
 live-build (2.0.7-1) unstable; urgency=medium
 
@@ -2538,7 +2538,7 @@ live-build (2.0.7-1) unstable; urgency=medium
     config.
   * Simplyfing ssh host key removal.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 22 Nov 2010 23:13:43 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 22 Nov 2010 23:13:43 +0100
 
 live-build (2.0.6-1) unstable; urgency=medium
 
@@ -2559,13 +2559,13 @@ live-build (2.0.6-1) unstable; urgency=medium
   [ Daniel Baumann ]
   * Making d-i indices copying depending on binary image type.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 13 Nov 2010 16:10:43 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 13 Nov 2010 16:10:43 +0100
 
 live-build (2.0.5-1) unstable; urgency=medium
 
   * Removing dpkg-tmpfs hack, this is too intrusive atm.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 28 Oct 2010 09:44:14 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 28 Oct 2010 09:44:14 +0200
 
 live-build (2.0.4-1) unstable; urgency=medium
 
@@ -2578,7 +2578,7 @@ live-build (2.0.4-1) unstable; urgency=medium
   * Removing deep link to bug page in the manual, since we don't have
     stable references yet.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 28 Oct 2010 09:34:43 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 28 Oct 2010 09:34:43 +0200
 
 live-build (2.0.3-1) unstable; urgency=medium
 
@@ -2599,7 +2599,7 @@ live-build (2.0.3-1) unstable; urgency=medium
     entries, will re-add them after squeeze.
   * Updating special handling for backports.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 12 Oct 2010 11:05:07 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 12 Oct 2010 11:05:07 +0200
 
 live-build (2.0.2-1) unstable; urgency=medium
 
@@ -2621,7 +2621,7 @@ live-build (2.0.2-1) unstable; urgency=medium
   [ Daniel Baumann ]
   * Correcting typo with lb config call for usb-hdd in autobuild script.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 02 Oct 2010 10:00:45 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 02 Oct 2010 10:00:45 +0200
 
 live-build (2.0.1-1) unstable; urgency=medium
 
@@ -2640,7 +2640,7 @@ live-build (2.0.1-1) unstable; urgency=medium
   * Avoid using bashism when handling codename/suite mapping for debian-
     installer release file.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 27 Sep 2010 07:41:45 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 27 Sep 2010 07:41:45 +0200
 
 live-build (2.0.0-1) unstable; urgency=medium
 
@@ -2678,7 +2678,7 @@ live-build (2.0.0-1) unstable; urgency=medium
     debootstrap seems not to create it anymore.
   * Releasing debian version 2.0.0-1.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 26 Sep 2010 12:14:46 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 26 Sep 2010 12:14:46 +0200
 
 live-build (2.0~a29-1) unstable; urgency=low
 
@@ -2696,7 +2696,7 @@ live-build (2.0~a29-1) unstable; urgency=low
   * Allowing also symlinks in chroot_local-packages (Closes: #593186).
   * Correcting typo in binary sources.list creating.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 16 Sep 2010 21:13:58 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 16 Sep 2010 21:13:58 +0200
 
 live-build (2.0~a28-1) unstable; urgency=low
 
@@ -2711,7 +2711,7 @@ live-build (2.0~a28-1) unstable; urgency=low
     (Closes: #572455).
   * Avoid running helpers twice when using auto (Closes: #584884).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 13 Sep 2010 21:28:16 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 13 Sep 2010 21:28:16 +0200
 
 live-build (2.0~a27-1) unstable; urgency=low
 
@@ -2724,7 +2724,7 @@ live-build (2.0~a27-1) unstable; urgency=low
   * Correcting --clean handling in lb_config.
   * Replacing references to lh commands with lb in live-build manpage.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 07 Sep 2010 21:41:44 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 07 Sep 2010 21:41:44 +0200
 
 live-build (2.0~a26-1) unstable; urgency=low
 
@@ -2739,14 +2739,14 @@ live-build (2.0~a26-1) unstable; urgency=low
   * Also deconfiguring /etc/hosts when using debootstrap to bootstrap
     system.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 06 Sep 2010 15:31:28 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 06 Sep 2010 15:31:28 +0200
 
 live-build (2.0~a25-1) unstable; urgency=low
 
   * Updating internal calls to use live-build instead of live-helper.
   * Updating lenny point release number.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 02 Sep 2010 15:15:31 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 02 Sep 2010 15:15:31 +0200
 
 live-build (2.0~a24-1) unstable; urgency=low
 
@@ -2775,7 +2775,7 @@ live-build (2.0~a24-1) unstable; urgency=low
   * Replacing some references to live-helper with live-build in
     debhelper bug files.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 02 Sep 2010 15:06:23 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 02 Sep 2010 15:06:23 +0200
 
 live-build (2.0~a23-1) unstable; urgency=low
 
@@ -2786,7 +2786,7 @@ live-build (2.0~a23-1) unstable; urgency=low
   * Moving /usr/share/live-helper to /usr/share/live/build.
   * Removing old and unmaintained po files.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 14 Aug 2010 20:53:08 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 14 Aug 2010 20:53:08 +0200
 
 live-build (2.0~a22-1) unstable; urgency=low
 
@@ -2822,7 +2822,7 @@ live-build (2.0~a22-1) unstable; urgency=low
     avoid ending up with a pulled in gnome in all cases, thanks a lot to
     Ben Armstrong <synrg@debian.org> for finding this solution.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 10 Aug 2010 04:21:01 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 10 Aug 2010 04:21:01 +0200
 
 live-build (2.0~a21-1) unstable; urgency=low
 
@@ -2839,7 +2839,7 @@ live-build (2.0~a21-1) unstable; urgency=low
   [ Marco Amadori ]
   * Correcting typo, live-helper should depend on live-build.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 27 Jul 2010 16:07:52 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 27 Jul 2010 16:07:52 +0200
 
 live-build (2.0~a20-1) unstable; urgency=low
 
@@ -2856,7 +2856,7 @@ live-build (2.0~a20-1) unstable; urgency=low
   * Removing example sources, not really useful anymore since
     repositories are in place.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 24 Jul 2010 17:22:56 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 24 Jul 2010 17:22:56 +0200
 
 live-helper (2.0~a19-1) unstable; urgency=low
 
@@ -2878,7 +2878,7 @@ live-helper (2.0~a19-1) unstable; urgency=low
   * Updating syslinux splash screen for squeeze.
   * Updating image autobuild script for squeeze alpha2.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 18 Jul 2010 01:16:13 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 18 Jul 2010 01:16:13 +0200
 
 live-helper (2.0~a18-1) unstable; urgency=low
 
@@ -2898,7 +2898,7 @@ live-helper (2.0~a18-1) unstable; urgency=low
   * Copying win32-loader recursively to cope with another win32-loader
     file re-arangement.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 10 Jul 2010 22:43:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 10 Jul 2010 22:43:00 +0200
 
 live-helper (2.0~a17-1) unstable; urgency=low
 
@@ -2932,7 +2932,7 @@ live-helper (2.0~a17-1) unstable; urgency=low
   * Correcting entry about --language in lh_config manpage, it doesn't
     set the bootparameters automatically for locale selection.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 02 Jul 2010 18:23:47 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 02 Jul 2010 18:23:47 +0200
 
 live-helper (2.0~a16-1) unstable; urgency=low
 
@@ -2989,7 +2989,7 @@ live-helper (2.0~a16-1) unstable; urgency=low
   * Making excludes handling simpler, and dropping excluding of kernel
     images for minimal or stripped images (Closes: #586367).
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 24 Jun 2010 01:49:57 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 24 Jun 2010 01:49:57 +0200
 
 live-helper (2.0~a15-1) unstable; urgency=low
 
@@ -3007,7 +3007,7 @@ live-helper (2.0~a15-1) unstable; urgency=low
   * Temporarily removing grub2 from d-i packages again, needs some fixes
     first.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 18 Jun 2010 04:01:29 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 18 Jun 2010 04:01:29 +0200
 
 live-helper (2.0~a14-1) unstable; urgency=low
 
@@ -3023,7 +3023,7 @@ live-helper (2.0~a14-1) unstable; urgency=low
   * Using umlauts in German manpages.
   * Using old pathes for win32-loader on squeeze too.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 30 May 2010 09:43:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 30 May 2010 09:43:00 +0200
 
 live-helper (2.0~a13-1) unstable; urgency=low
 
@@ -3059,7 +3059,7 @@ live-helper (2.0~a13-1) unstable; urgency=low
   * Adding user-setup to minimal packages list.
   * Setting version number to 2.0~a13.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 23 May 2010 12:37:33 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 23 May 2010 12:37:33 +0200
 
 live-helper (2.0~a12-1) unstable; urgency=low
 
@@ -3083,7 +3083,7 @@ live-helper (2.0~a12-1) unstable; urgency=low
     projects.org.
   * Setting version number.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 12 May 2010 06:01:39 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 12 May 2010 06:01:39 +0200
 
 live-helper (2.0~a11-1) unstable; urgency=low
 
@@ -3108,7 +3108,7 @@ live-helper (2.0~a11-1) unstable; urgency=low
     scripts.
   * Updating maintainer field.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 30 Apr 2010 17:10:38 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 30 Apr 2010 17:10:38 +0200
 
 live-helper (2.0~a10-1) unstable; urgency=low
 
@@ -3128,7 +3128,7 @@ live-helper (2.0~a10-1) unstable; urgency=low
   * Adding gdb to rescue list.
   * Updating Man function to work with lh as wrapper.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 09 Apr 2010 21:29:10 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 09 Apr 2010 21:29:10 +0200
 
 live-helper (2.0~a9-1) unstable; urgency=low
 
@@ -3208,7 +3208,7 @@ live-helper (2.0~a9-1) unstable; urgency=low
   * Simplifying wording in bug-presubj file.
   * Reordering auto install overrides in rules file.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 14 Mar 2010 23:31:59 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 14 Mar 2010 23:31:59 +0100
 
 live-helper (2.0~a8-1) unstable; urgency=low
 
@@ -3244,7 +3244,7 @@ live-helper (2.0~a8-1) unstable; urgency=low
   * Updating tasks handling for squeeze.
   * Updating default desktop configuration quirks.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 21 Feb 2010 14:42:21 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 21 Feb 2010 14:42:21 +0100
 
 live-helper (2.0~a7-1) unstable; urgency=low
 
@@ -3276,7 +3276,7 @@ live-helper (2.0~a7-1) unstable; urgency=low
     Cohen <tzafrir.cohen@xorcom.com>.
   * Removing whitespaces at the end of bootappend-install assignements.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 17 Feb 2010 12:30:46 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 17 Feb 2010 12:30:46 +0100
 
 live-helper (2.0~a6-1) unstable; urgency=low
 
@@ -3289,7 +3289,7 @@ live-helper (2.0~a6-1) unstable; urgency=low
   * Also making use of package cache during chroot_local-hooks (Closes:
     #566838).
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 31 Jan 2010 14:20:23 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 31 Jan 2010 14:20:23 +0100
 
 live-helper (2.0~a5-1) unstable; urgency=low
 
@@ -3307,7 +3307,7 @@ live-helper (2.0~a5-1) unstable; urgency=low
     mksquashfs so that users know what is going on, thanks to Michal
     Suchanek <michal.suchanek@ruk.cuni.cz> (Closes: #566250).
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 23 Jan 2010 12:47:21 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 23 Jan 2010 12:47:21 +0100
 
 live-helper (2.0~a4-1) unstable; urgency=low
 
@@ -3335,7 +3335,7 @@ live-helper (2.0~a4-1) unstable; urgency=low
   * Adjusting lh_config manpage to reflect changes wrt/ local packages
     lists.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 19 Jan 2010 20:25:35 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 19 Jan 2010 20:25:35 +0100
 
 live-helper (2.0~a3-1) unstable; urgency=low
 
@@ -3352,7 +3352,7 @@ live-helper (2.0~a3-1) unstable; urgency=low
     configuration options.
   * Adding experimental support for isohybrid (Closes: #558688).
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 13 Dec 2009 21:41:49 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 13 Dec 2009 21:41:49 +0100
 
 live-helper (2.0~a2-1) unstable; urgency=low
 
@@ -3370,7 +3370,7 @@ live-helper (2.0~a2-1) unstable; urgency=low
   * Setting LH_BASE variable in defaults.sh globally.
   * Adding changelog of 1.0.6-2.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 30 Nov 2009 12:41:06 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 30 Nov 2009 12:41:06 +0100
 
 live-helper (2.0~a1-1) experimental; urgency=low
 
@@ -3380,14 +3380,14 @@ live-helper (2.0~a1-1) experimental; urgency=low
     /usr/bin.
   * Removing legacy function for dashed commands.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 15 Nov 2009 22:42:59 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 15 Nov 2009 22:42:59 +0100
 
 live-helper (1.0.6-2) unstable; urgency=high
 
   * Replacing sed 4.2 command to assemble debootstraps components option
     with a less advanced one, in order to work on legacy distributions.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 22 Nov 2009 13:35:50 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 22 Nov 2009 13:35:50 +0100
 
 live-helper (1.0.6-1) unstable; urgency=medium
 
@@ -3507,7 +3507,7 @@ live-helper (1.0.6-1) unstable; urgency=medium
   * Removing newline in f8.txt.install syslinux template.
   * Removing newline in f6.txt syslinux template.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 15 Nov 2009 17:16:19 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 15 Nov 2009 17:16:19 +0100
 
 live-helper (1.0.5-2) unstable; urgency=low
 
@@ -3593,7 +3593,7 @@ live-helper (1.0.5-2) unstable; urgency=low
   * Adding a message about which hook made a build fail, if any.
   * Updating lenny point release number.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 04 Sep 2009 13:21:04 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 04 Sep 2009 13:21:04 +0200
 
 live-helper (1.0.5-1) unstable; urgency=medium
 
@@ -3721,7 +3721,7 @@ live-helper (1.0.5-1) unstable; urgency=medium
   * Emitting a warning if resolvconf is detected on the to be generated
     live system. Beware of resolvconf, it's broken beyond repair.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 14 Jun 2009 15:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 14 Jun 2009 15:00:00 +0200
 
 live-helper (1.0.4-1) unstable; urgency=low
 
@@ -3741,7 +3741,7 @@ live-helper (1.0.4-1) unstable; urgency=low
   * Correcting path within netboot tarballs.
   * Redirecting stderr to log as well in example image build script.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 14 Feb 2009 18:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 14 Feb 2009 18:00:00 +0100
 
 live-helper (1.0.3-2) unstable; urgency=medium
 
@@ -3785,7 +3785,7 @@ live-helper (1.0.3-2) unstable; urgency=medium
   [ Tiago Bortoletto Vaz ]
   * Updating pt_br localization (Closes: #514196).
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 10 Feb 2009 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 10 Feb 2009 00:00:00 +0100
 
 live-helper (1.0.3-1) unstable; urgency=medium
 
@@ -3862,7 +3862,7 @@ live-helper (1.0.3-1) unstable; urgency=medium
   * Correcting wrong logic in defaults.sh which resultet in having
     loop-aes-utils always installed.
 
- -- Daniel Baumann <daniel@debian.org>  Sun,  1 Feb 2009 17:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun,  1 Feb 2009 17:00:00 +0100
 
 live-helper (1.0.2-4) unstable; urgency=low
 
@@ -3871,7 +3871,7 @@ live-helper (1.0.2-4) unstable; urgency=low
   * Moving removal of apt packages lists from minimal and stripped hook
     to lh_chroot_sources, thanks to Ben Armstrong <synrg@debian.org>.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 12 Jan 2009 13:00:00 -0500
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 12 Jan 2009 13:00:00 -0500
 
 live-helper (1.0.2-3) unstable; urgency=medium
 
@@ -3895,7 +3895,7 @@ live-helper (1.0.2-3) unstable; urgency=medium
     up with a local resolv.conf in the final image. Thanks to Ben Armstrong
     <synrg@debian.org>.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 10 Jan 2009 15:00:00 -0500
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 10 Jan 2009 15:00:00 -0500
 
 live-helper (1.0.2-2) unstable; urgency=medium
 
@@ -3904,7 +3904,7 @@ live-helper (1.0.2-2) unstable; urgency=medium
   * Marking pstack in rescuelist as i386 only.
   * Updating location of archive key in in image autobuild script.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 26 Dec 2008 09:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 26 Dec 2008 09:00:00 +0100
 
 live-helper (1.0.2-1) unstable; urgency=medium
 
@@ -3913,7 +3913,7 @@ live-helper (1.0.2-1) unstable; urgency=medium
   * Updating udeb data.
   * Updating cd includes.
 
- -- Daniel Baumann <daniel@debian.org>  Sat, 20 Dec 2008 15:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sat, 20 Dec 2008 15:00:00 +0100
 
 live-helper (1.0.1-4) unstable; urgency=medium
 
@@ -3937,7 +3937,7 @@ live-helper (1.0.1-4) unstable; urgency=medium
   [ Marco Amadori ]
   * NEW: "binary_debian-installer-includes" config directory.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 11 Dec 2008 06:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 11 Dec 2008 06:00:00 +0100
 
 live-helper (1.0.1-3) unstable; urgency=medium
 
@@ -3959,7 +3959,7 @@ live-helper (1.0.1-3) unstable; urgency=medium
     correct owner and permissions, we set them manually on /home/user as
     it's likely that anybody will forget it (Closes: #506553).
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 25 Nov 2008 12:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 25 Nov 2008 12:00:00 +0100
 
 live-helper (1.0.1-2) unstable; urgency=medium
 
@@ -4077,7 +4077,7 @@ live-helper (1.0.1-2) unstable; urgency=medium
   [ Kai Hendry ]
   * Removing etch-only madwifi-doc package from madwifi example hook.
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 11 Nov 2008 13:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 11 Nov 2008 13:00:00 +0100
 
 live-helper (1.0.1-1) unstable; urgency=medium
 
@@ -4150,7 +4150,7 @@ live-helper (1.0.1-1) unstable; urgency=medium
   [ Marco Amadori ]
   * Splitted "longoptions" in various lines.
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 19 Sep 2008 14:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 19 Sep 2008 14:00:00 +0200
 
 live-helper (1.0.0-2) unstable; urgency=medium
 
@@ -4185,7 +4185,7 @@ live-helper (1.0.0-2) unstable; urgency=medium
   [ Marco Amadori ]
   * Fixed 2 typos in getopt longoptions string.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  1 Sep 2008 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  1 Sep 2008 00:00:00 +0200
 
 live-helper (1.0.0-1) unstable; urgency=medium
 
@@ -4323,7 +4323,7 @@ live-helper (1.0.0-1) unstable; urgency=medium
   * Adding missing debian-installer options in lh_config --help message.
   * Improving message when using default values in /etc/default/live-helper.
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 24 Aug 2008 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 24 Aug 2008 00:00:00 +0200
 
 live-helper (1.0~a48-1) unstable; urgency=medium
 
@@ -4431,7 +4431,7 @@ live-helper (1.0~a48-1) unstable; urgency=medium
   * Added support for /etc/live-helper.
   * Removed a useless space.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 14 Jul 2008 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 14 Jul 2008 00:00:00 +0200
 
 live-helper (1.0~a47-1) unstable; urgency=medium
 
@@ -4452,7 +4452,7 @@ live-helper (1.0~a47-1) unstable; urgency=medium
   * Updating udeb include/exclude files from debian-cd.
   * Reverting previous commit to compress build logs.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  9 Jun 2008 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  9 Jun 2008 00:00:00 +0200
 
 live-helper (1.0~a46-2) unstable; urgency=medium
 
@@ -4471,7 +4471,7 @@ live-helper (1.0~a46-2) unstable; urgency=medium
   * Only install sysutils on Etch in rescue list
   * Only install read-edid on i386 and powerpc in rescue list
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 28 Apr 2008 18:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 28 Apr 2008 18:00:00 +0200
 
 live-helper (1.0~a46-1) unstable; urgency=low
 
@@ -4505,7 +4505,7 @@ live-helper (1.0~a46-1) unstable; urgency=low
   * Getting architecture dynamically in images cron script.
   * Correcting permissions in snapshot script.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 28 Apr 2008 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 28 Apr 2008 00:00:00 +0200
 
 live-helper (1.0~a45-1) unstable; urgency=medium
 
@@ -4539,7 +4539,7 @@ live-helper (1.0~a45-1) unstable; urgency=medium
   * Adjusting Save_cache(); to skip already cached .deb files and only
     copying new packages to it.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 21 Apr 2008 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 21 Apr 2008 00:00:00 +0200
 
 live-helper (1.0~a44-1) unstable; urgency=medium
 
@@ -4567,7 +4567,7 @@ live-helper (1.0~a44-1) unstable; urgency=medium
   * Also adding a packages.txt when building etch images, although there
     is a casper/filesystem.manifest already.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 14 Apr 2008 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 14 Apr 2008 00:00:00 +0200
 
 live-helper (1.0~a43-1) unstable; urgency=medium
 
@@ -4583,7 +4583,7 @@ live-helper (1.0~a43-1) unstable; urgency=medium
   * Removing temporary workaround of adding lzma-modules2.6 to linux
     packages, all fixed squashfs are now in sid and lenny.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  7 Apr 2008 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  7 Apr 2008 00:00:00 +0200
 
 live-helper (1.0~a42-1) unstable; urgency=medium
 
@@ -4594,7 +4594,7 @@ live-helper (1.0~a42-1) unstable; urgency=medium
     Check_crossarchitecture() working on non-listed architectures
     (Closes: #472775).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 31 Mar 2008 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 31 Mar 2008 00:00:00 +0200
 
 live-helper (1.0~a41-1) unstable; urgency=medium
 
@@ -4632,7 +4632,7 @@ live-helper (1.0~a41-1) unstable; urgency=medium
   [ Cyril Brulebois ]
   * Fix various typos.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 24 Mar 2008 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 24 Mar 2008 00:00:00 +0100
 
 live-helper (1.0~a40-1) unstable; urgency=medium
 
@@ -4662,7 +4662,7 @@ live-helper (1.0~a40-1) unstable; urgency=medium
   * functions/losetup.sh: use SECTORS as variable name to reflect the
     real usage
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 10 Mar 2008 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 10 Mar 2008 00:00:00 +0100
 
 live-helper (1.0~a39-1) unstable; urgency=medium
 
@@ -4694,7 +4694,7 @@ live-helper (1.0~a39-1) unstable; urgency=medium
   * Also handling ext3 in lh_binary_rootfs, thanks to Bas Wijnen
     <wijnen@debian.org> (Closes: #468902).
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  3 Mar 2008 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  3 Mar 2008 00:00:00 +0100
 
 live-helper (1.0~a38-1) unstable; urgency=medium
 
@@ -4788,13 +4788,13 @@ live-helper (1.0~a38-1) unstable; urgency=medium
   * lh_binary_encryption: add jffs2 as not supported filesystem
   * lh_binary_rootfs: add support to generate jffs2 filesystem
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 26 Feb 2008 13:33:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 26 Feb 2008 13:33:00 +0100
 
 live-helper (1.0~a37-2) unstable; urgency=medium
 
   * Disabling global arguments in lh_clean (Closes: #451960).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 19 Nov 2007 18:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 19 Nov 2007 18:00:00 +0100
 
 live-helper (1.0~a37-1) unstable; urgency=medium
 
@@ -4838,7 +4838,7 @@ live-helper (1.0~a37-1) unstable; urgency=medium
   * Rewritten lh_config manpage.
   * Rewritten lh_testroot manpage.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 19 Nov 2007 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 19 Nov 2007 00:00:00 +0100
 
 live-helper (1.0~a36-1) unstable; urgency=medium
 
@@ -4884,7 +4884,7 @@ live-helper (1.0~a36-1) unstable; urgency=medium
     needs some other changes before it can safely be done.
   * Adding 'remove' case, which is in between of all and purge.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 12 Nov 2007 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 12 Nov 2007 00:00:00 +0100
 
 live-helper (1.0~a35-1) unstable; urgency=medium
 
@@ -4910,7 +4910,7 @@ live-helper (1.0~a35-1) unstable; urgency=medium
   * fix isolinux when booting multiple kernel flavours
   * add new option --syslinux-menu to enable syslinux menu
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  5 Nov 2007 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  5 Nov 2007 00:00:00 +0100
 
 live-helper (1.0~a34-1) unstable; urgency=medium
 
@@ -4932,7 +4932,7 @@ live-helper (1.0~a34-1) unstable; urgency=medium
   * Fixed lh_config tool name in manpage.
   * Avoid [Y/n] query on package autoremove in "mini" hook.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 29 Oct 2007 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 29 Oct 2007 00:00:00 +0100
 
 live-helper (1.0~a33-1) unstable; urgency=medium
 
@@ -4955,7 +4955,7 @@ live-helper (1.0~a33-1) unstable; urgency=medium
   * Remove ".img" from kernel image file name.
   * Added feature to exclude paths from the root filesystem.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 22 Oct 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 22 Oct 2007 00:00:00 +0200
 
 live-helper (1.0~a32-1) unstable; urgency=medium
 
@@ -4988,7 +4988,7 @@ live-helper (1.0~a32-1) unstable; urgency=medium
   * lh_binary_syslinux: always put splash image as splash.{rle,png} to avoid
     filename issues
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 15 Oct 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 15 Oct 2007 00:00:00 +0200
 
 live-helper (1.0~a31-1) unstable; urgency=medium
 
@@ -5011,7 +5011,7 @@ live-helper (1.0~a31-1) unstable; urgency=medium
     not exists
   * syslinux: fix usb-hdd templates coping
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  8 Oct 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  8 Oct 2007 00:00:00 +0200
 
 live-helper (1.0~a30-1) unstable; urgency=medium
 
@@ -5047,7 +5047,7 @@ live-helper (1.0~a30-1) unstable; urgency=medium
   * debian/control: use XS-Homepage to avoid errors while calling dpkg-
     gencontrol
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  1 Oct 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  1 Oct 2007 00:00:00 +0200
 
 live-helper (1.0~a29-1) unstable; urgency=medium
 
@@ -5057,31 +5057,31 @@ live-helper (1.0~a29-1) unstable; urgency=medium
     - Fixed typing error in lh_binary_syslinux, thanks to Jean Pierre LeJacq
       <jp.lejacq@quoininc.com> (Closes: #443099).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 24 Sep 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 24 Sep 2007 00:00:00 +0200
 
 live-helper (1.0~a28-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 17 Sep 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 17 Sep 2007 00:00:00 +0200
 
 live-helper (1.0~a27-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 10 Sep 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 10 Sep 2007 00:00:00 +0200
 
 live-helper (1.0~a26-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  3 Sep 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  3 Sep 2007 00:00:00 +0200
 
 live-helper (1.0~a25-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 27 Aug 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 27 Aug 2007 00:00:00 +0200
 
 live-helper (1.0~a24-1) unstable; urgency=medium
 
@@ -5089,13 +5089,13 @@ live-helper (1.0~a24-1) unstable; urgency=medium
     - lh_clean accepts more than one argument at the same time
       (Closes: #439947).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 20 Aug 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 20 Aug 2007 00:00:00 +0200
 
 live-helper (1.0~a23-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 13 Aug 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 13 Aug 2007 00:00:00 +0200
 
 live-helper (1.0~a22-1) unstable; urgency=medium
 
@@ -5105,20 +5105,20 @@ live-helper (1.0~a22-1) unstable; urgency=medium
       lh_binary_yaboot to work under dash (Closes: #431748).
     - Using fake hostname instead of setting it at build-time (Closes: #435699).
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  6 Aug 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  6 Aug 2007 00:00:00 +0200
 
 live-helper (1.0~a21-1) unstable; urgency=medium
 
   * New upstream release:
     - Suppresses xorg configuration in chroot (Closes: #430566).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 30 Jul 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 30 Jul 2007 00:00:00 +0200
 
 live-helper (1.0~a20-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 23 Jul 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 23 Jul 2007 00:00:00 +0200
 
 live-helper (1.0~a19-1) unstable; urgency=medium
 
@@ -5126,72 +5126,72 @@ live-helper (1.0~a19-1) unstable; urgency=medium
     - Supports using packages from the build host (Closes: #433611).
     - Adds destdir to default entries in grub (Closes: #433612).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 16 Jul 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 16 Jul 2007 00:00:00 +0200
 
 live-helper (1.0~a18-1) unstable; urgency=medium
 
   * New upstream release:
     - Dropping transitional package, not needed anymore.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  9 Jul 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  9 Jul 2007 00:00:00 +0200
 
 live-helper (1.0~a17-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  2 Jul 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  2 Jul 2007 00:00:00 +0200
 
 live-helper (1.0~a16-1) unstable; urgency=medium
 
   * New upstream release:
     - Caches also linux-image packages (Closes: #430511).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 25 Jun 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 25 Jun 2007 00:00:00 +0200
 
 live-helper (1.0~a15-1) unstable; urgency=medium
 
   * New upstream release:
     - corrected wrong project name in examples/sources/fai (Closes: #428360).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 18 Jun 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 18 Jun 2007 00:00:00 +0200
 
 live-helper (1.0~a14-1) unstable; urgency=medium
 
   * New upstream release:
     - fixes typo in manpage (Closes: #428192).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 11 Jun 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 11 Jun 2007 00:00:00 +0200
 
 live-helper (1.0~a13-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  4 Jun 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  4 Jun 2007 00:00:00 +0200
 
 live-helper (1.0~a12-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 28 May 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 28 May 2007 00:00:00 +0200
 
 live-helper (1.0~a11-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 21 May 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 21 May 2007 00:00:00 +0200
 
 live-helper (1.0~a10-1) unstable; urgency=medium
 
   * New upstream release:
     - really removed forgotten set -x in the cron (Closes: #421105).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 14 May 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 14 May 2007 00:00:00 +0200
 
 live-helper (1.0~a9-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  7 May 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  7 May 2007 00:00:00 +0200
 
 live-helper (1.0~a8-1) unstable; urgency=medium
 
@@ -5199,7 +5199,7 @@ live-helper (1.0~a8-1) unstable; urgency=medium
     - updated syslinux templates (Closes: #399658).
     - removed forgotten set -x in the cron (Closes: #421105).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 30 Apr 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 30 Apr 2007 00:00:00 +0200
 
 live-helper (1.0~a7-1) unstable; urgency=medium
 
@@ -5208,73 +5208,73 @@ live-helper (1.0~a7-1) unstable; urgency=medium
       (Closes: #394334, #410147).
     - supporting sudo (Closes: #387069).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 23 Apr 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 23 Apr 2007 00:00:00 +0200
 
 live-helper (1.0~a6-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 16 Apr 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 16 Apr 2007 00:00:00 +0200
 
 live-helper (1.0~a5-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  9 Apr 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  9 Apr 2007 00:00:00 +0200
 
 live-helper (1.0~a4-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  2 Apr 2007 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  2 Apr 2007 00:00:00 +0200
 
 live-helper (1.0~a3-2) unstable; urgency=low
 
   * New upstream snapshot.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 26 Mar 2007 17:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 26 Mar 2007 17:00:00 +0200
 
 live-helper (1.0~a3-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 26 Mar 2007 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 26 Mar 2007 00:00:00 +0100
 
 live-helper (1.0~a2-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 19 Mar 2007 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 19 Mar 2007 00:00:00 +0100
 
 live-helper (1.0~a1-3) unstable; urgency=low
 
   * New upstream snapshot.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 14 Mar 2007 21:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 14 Mar 2007 21:00:00 +0100
 
 live-helper (1.0~a1-2) unstable; urgency=low
 
   * New upstream snapshot.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 14 Mar 2007 18:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 14 Mar 2007 18:00:00 +0100
 
 live-helper (1.0~a1-1) unstable; urgency=low
 
   * Initial release, replacing live-package.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 12 Mar 2007 00:00:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 12 Mar 2007 00:00:00 +0100
 
 live-package (0.99.26-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Fri,  9 Mar 2007 12:27:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri,  9 Mar 2007 12:27:00 +0100
 
 live-package (0.99.25-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Fri,  9 Mar 2007 01:49:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri,  9 Mar 2007 01:49:00 +0100
 
 live-package (0.99.24-1) unstable; urgency=low
 
@@ -5282,26 +5282,26 @@ live-package (0.99.24-1) unstable; urgency=low
     - adds LIVE_INCLUDE_CHROOT to the manual exported variables as reported by
       Mathieu Geli <mathieu.geli@gmail.com> (Closes: #412325).
 
- -- Daniel Baumann <daniel@debian.org>  Sun,  3 Mar 2007 12:25:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun,  3 Mar 2007 12:25:00 +0100
 
 live-package (0.99.23-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 21 Feb 2007 22:08:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 21 Feb 2007 22:08:00 +0100
 
 live-package (0.99.22-1) unstable; urgency=low
 
   * New upstream release:
     - updates manpage (Closes: #411008).
 
- -- Daniel Baumann <daniel@debian.org>  Fri, 16 Feb 2007 20:38:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri, 16 Feb 2007 20:38:00 +0100
 
 live-package (0.99.21-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 12 Feb 2007 15:06:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 12 Feb 2007 15:06:00 +0100
 
 live-package (0.99.20-1) unstable; urgency=low
 
@@ -5309,31 +5309,31 @@ live-package (0.99.20-1) unstable; urgency=low
     - Fixed manual pruning in minimal flavour as suggested by
       Bas Wijnen <wijnen@debian.org> (Closes: #410040).
 
- -- Daniel Baumann <daniel@debian.org>  Thu,  1 Feb 2007 17:35:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu,  1 Feb 2007 17:35:00 +0100
 
 live-package (0.99.19-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 31 Jan 2007 12:38:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 31 Jan 2007 12:38:00 +0100
 
 live-package (0.99.18-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 25 Jan 2007 08:29:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 25 Jan 2007 08:29:00 +0100
 
 live-package (0.99.17-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 24 Jan 2007 22:18:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 24 Jan 2007 22:18:00 +0100
 
 live-package (0.99.16-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Thu, 18 Jan 2007 16:25:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu, 18 Jan 2007 16:25:00 +0100
 
 live-package (0.99.15-1) unstable; urgency=low
 
@@ -5342,7 +5342,7 @@ live-package (0.99.15-1) unstable; urgency=low
       again from the kernel point of view (Closes: #400457).
     - added file to the minimal package list (Closes: #400485).
 
- -- Daniel Baumann <daniel@debian.org>  Tue, 16 Jan 2007 21:24:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 16 Jan 2007 21:24:00 +0100
 
 live-package (0.99.14-4) testing; urgency=medium
 
@@ -5351,7 +5351,7 @@ live-package (0.99.14-4) testing; urgency=medium
   * 14chroot.sh: Fixed misspelling of aptitude.
   * main.sh: Updated release codenames to match etch.
 
- -- Daniel Baumann <daniel@debian.org>  Thu,  8 Mar 2007 10:55:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu,  8 Mar 2007 10:55:00 +0100
 
 live-package (0.99.14-3) unstable; urgency=high
 
@@ -5360,13 +5360,13 @@ live-package (0.99.14-3) unstable; urgency=high
     information.
   * Adding xdebconfigurator to all X11 package lists.
 
- -- Daniel Baumann <daniel@debian.org>  Fri,  5 Jan 2007 22:34:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Fri,  5 Jan 2007 22:34:00 +0100
 
 live-package (0.99.14-2) unstable; urgency=high
 
   * Adding workaround for initrd backup files (Closes: #404314).
 
- -- Daniel Baumann <daniel@debian.org>  Thu,  4 Jan 2007 20:52:00 +0100
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Thu,  4 Jan 2007 20:52:00 +0100
 
 live-package (0.99.14-1) unstable; urgency=medium
 
@@ -5378,13 +5378,13 @@ live-package (0.99.14-1) unstable; urgency=medium
     - fixes script sourcing to exclude files in .svn (Closes: #396861),
       thanks to Markus Bauer <bauer-markus@web.de>.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  6 Nov 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  6 Nov 2006 00:00:00 +0200
 
 live-package (0.99.13-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 30 Oct 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 30 Oct 2006 00:00:00 +0200
 
 live-package (0.99.12-1) unstable; urgency=medium
 
@@ -5392,19 +5392,19 @@ live-package (0.99.12-1) unstable; urgency=medium
     - Reverted mangling of LIVE_DISTRIBUTION for sources.list generation
       (Closes: #394226).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 23 Oct 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 23 Oct 2006 00:00:00 +0200
 
 live-package (0.99.11-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 16 Oct 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 16 Oct 2006 00:00:00 +0200
 
 live-package (0.99.10-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  9 Oct 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  9 Oct 2006 00:00:00 +0200
 
 live-package (0.99.9-1) unstable; urgency=medium
 
@@ -5412,13 +5412,13 @@ live-package (0.99.9-1) unstable; urgency=medium
     - adds support for custom repositories (Closes: #387068).
     - using proxy for chroot creating too (Closes: #390378).
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  2 Oct 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  2 Oct 2006 00:00:00 +0200
 
 live-package (0.99.8-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 25 Sep 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 25 Sep 2006 00:00:00 +0200
 
 live-package (0.99.7-1) unstable; urgency=medium
 
@@ -5430,21 +5430,21 @@ live-package (0.99.7-1) unstable; urgency=medium
     - fixes package list handling similar to the fix suggested by Alex Owen
       <r.alex.owen@gmail.com> (Closes: #388060).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 18 Sep 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 18 Sep 2006 00:00:00 +0200
 
 live-package (0.99.6-1) unstable; urgency=medium
 
   * New upstream release:
     - fixing netboot.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 11 Sep 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 11 Sep 2006 00:00:00 +0200
 
 live-package (0.99.5-1) unstable; urgency=low
 
   * New upstream release.
   * Set maintainer to the project list.
 
- -- Daniel Baumann <daniel@debian.org>  Mon,  4 Sep 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon,  4 Sep 2006 00:00:00 +0200
 
 live-package (0.99.4-1) unstable; urgency=low
 
@@ -5454,7 +5454,7 @@ live-package (0.99.4-1) unstable; urgency=low
     - Temporarily hacks xorg configuration file to remove BusID and set
       default driver to vesa (Closes: #382391).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 28 Aug 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 28 Aug 2006 00:00:00 +0200
 
 live-package (0.99.3-1) unstable; urgency=low
 
@@ -5462,22 +5462,22 @@ live-package (0.99.3-1) unstable; urgency=low
     - fixed configuration file handling (Closes: #384598).
   * Update long descriptiong (Closes: #382473).
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 21 Aug 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 21 Aug 2006 00:00:00 +0200
 
 live-package (0.99.2-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 31 Jul 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 31 Jul 2006 00:00:00 +0200
 
 live-package (0.99.1-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 24 Jul 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 24 Jul 2006 00:00:00 +0200
 
 live-package (0.99-1) unstable; urgency=low
 
   * Initial release.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 17 Jul 2006 00:00:00 +0200
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 17 Jul 2006 00:00:00 +0200
diff --git a/debian/control b/debian/control
index 414b0418c..2fe28fe08 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: live-build
 Section: misc
 Priority: optional
 Maintainer: Debian Live Project <debian-live@lists.debian.org>
-Uploaders: Daniel Baumann <daniel@debian.org>
+Uploaders: Daniel Baumann <mail@daniel-baumann.ch>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.4
 Homepage: http://live.debian.net/devel/live-build/
diff --git a/debian/copyright b/debian/copyright
index c96991b50..ca28aab53 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,11 +4,11 @@ Upstream-Contact: Debian Live Project <debian-live@lists.debian.org>
 Source: http://live.debian.net/archive/packages/live-build/
 
 Files: *
-Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
+Copyright: 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 License: GPL-3+
 
 Files: share/bootloaders/*/splash.svg.in
-Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
+Copyright: 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 License: other
 
 License: GPL-3+
@@ -29,7 +29,7 @@ License: GPL-3+
  can be found in /usr/share/common-licenses/GPL-3 file.
 
 License: other
- The splash for Debian Live was made by Daniel Baumann <daniel@debian.org> based
+ The splash for Debian Live was made by Daniel Baumann <mail@daniel-baumann.ch> based
  on the Debian Open Use Logo.
  .
  The contribution of Daniel is hereby placed in the public domain (no rights
diff --git a/docs/AUTHORS b/docs/AUTHORS
index 1d63e4742..ba38a0f26 100644
--- a/docs/AUTHORS
+++ b/docs/AUTHORS
@@ -1,6 +1,6 @@
 Main Author:
 
-  * Daniel Baumann <daniel@debian.org>
+  * Daniel Baumann <mail@daniel-baumann.ch>
 
 Main Contributors:
 
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 0b7f08770..74443ec60 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,5 +1,5 @@
 commit 4217cf64597aa81b82a8c8e6a79fee1381e06aa3
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Re-enabling live-initscripts and live-webhelper.
 
@@ -7,7 +7,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 commit c4bb536877d822570176d462a45d3497de05a01b
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Respecting LH_QUIET for genisoimage/mkisofs calls, thanks to Justin Pryzby <pryzbyj@justinpryzby.com>.
 
@@ -16,7 +16,7 @@ Author: Daniel Baumann <daniel@debian.org>
  2 files changed, 10 insertions(+), 0 deletions(-)
 
 commit a019b98615f9edd154f48337f45656fbc86cd181
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Respecting LH_QUIET for wget calls, thanks to Justin Pryzby <pryzbyj@justinpryzby.com>.
 
@@ -24,7 +24,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 12 insertions(+), 7 deletions(-)
 
 commit 09faf3f24b1d24394071fc651685436a269c37a4
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Handling case when memtest is disabled.
 
@@ -32,7 +32,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 4 insertions(+), 1 deletions(-)
 
 commit f3706cd7f2fa293fed28523c760715967a7ae2e1
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Adding check for 'none', not just 'disabled'.
 
@@ -40,14 +40,14 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 commit 793f620b2dd2687f1c1cbb2db6b2eb65ed63275b
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Restoring file permissions.
 
  0 files changed, 0 insertions(+), 0 deletions(-)
 
 commit 4b52adb6f77b855ac9e6f63de187ae6ecba3602e
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Adding local udeb_exclude file functionality.
 
@@ -56,7 +56,7 @@ Author: Daniel Baumann <daniel@debian.org>
  2 files changed, 7 insertions(+), 0 deletions(-)
 
 commit fbae06c4262ee01d22af51b9720470a87a1e571b
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Fixing typing error in lh_binary_syslinux, thanks to Jean Pierre LeJacq <jp.lejacq@quoininc.com> (Closes: #443099).
 
@@ -65,7 +65,7 @@ Author: Daniel Baumann <daniel@debian.org>
  2 files changed, 3 insertions(+), 1 deletions(-)
 
 commit 9ceced95c4a101b632d2b40cb0716338b223faeb
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Adding preinst to take care about package upgrades with respect to directories that are symlinks now (Closes: #442408, #442922).
 
@@ -74,7 +74,7 @@ Author: Daniel Baumann <daniel@debian.org>
  2 files changed, 43 insertions(+), 1 deletions(-)
 
 commit 4d06f0aa2b3a3f8a300b8a45310e1b7b5748c4a3
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Adding contrib/graph-helpers/*.
 
@@ -84,7 +84,7 @@ Author: Daniel Baumann <daniel@debian.org>
  3 files changed, 95 insertions(+), 76 deletions(-)
 
 commit 39d4c50fc75166d6d8f43126a079e5497e7ff089
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Added graph-helpers.py from Chris Lamb <chris@chris-lamb.co.uk>.
 
@@ -92,7 +92,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 74 insertions(+), 0 deletions(-)
 
 commit 5e759644a47983d74338d46904106b552153c446
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Passing live bootappends to debian-installer.
 
@@ -101,7 +101,7 @@ Author: Daniel Baumann <daniel@debian.org>
  2 files changed, 9 insertions(+), 9 deletions(-)
 
 commit f64d4d2c3124043b9039a38d9c1f037e923c3297
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Preparing live-helper 1.0~a29-1.
 
@@ -133,7 +133,7 @@ Author: Daniel Baumann <daniel@debian.org>
  25 files changed, 32 insertions(+), 26 deletions(-)
 
 commit 7d5c33610881beee30fea2dc162d21f9e7436039
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Releasing live-helper 1.0~a28-1.
 
@@ -142,7 +142,7 @@ Author: Daniel Baumann <daniel@debian.org>
  2 files changed, 287 insertions(+), 1 deletions(-)
 
 commit f6d46179dfb64ace95c6cdec6a5b910d9106a7e7
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Making binary hooks executable in case the are not.
 
@@ -150,7 +150,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 6 insertions(+), 0 deletions(-)
 
 commit f36f7d499ad7ba96a66977ae5e8955fb6b74128e
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Do not remove pkgsel anymore.
 
@@ -158,7 +158,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 0 insertions(+), 2 deletions(-)
 
 commit 2b817e2b897f6db20e81fcd52e40f90bcda16237
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Fixed wrong sed call.
 
@@ -166,7 +166,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 1db91d83b0d0311c07d8f96023e850efdb44f7eb
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Do not create symlinks on usb-hdd images.
 
@@ -174,7 +174,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 4 insertions(+), 1 deletions(-)
 
 commit ed5bb2e1870d68a8d6318933d9fe6ca2f1d9069c
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Adding LH_BOOTAPPEND_INSTALL.
 
@@ -186,7 +186,7 @@ Author: Daniel Baumann <daniel@debian.org>
  5 files changed, 20 insertions(+), 9 deletions(-)
 
 commit 851d21e47455408a300ce8c527e3805f2e039e64
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Renaming LH_BOOTAPPEND to LH_BOOTAPPEND_LIVE.
 
@@ -198,7 +198,7 @@ Author: Daniel Baumann <daniel@debian.org>
  5 files changed, 40 insertions(+), 40 deletions(-)
 
 commit 26961cb572225683e29e03176698447b58b19bc4
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Making local udebs/local debs architecture aware.
 
@@ -206,7 +206,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 4 insertions(+), 4 deletions(-)
 
 commit caeb8b9d72f691833691f193102537fe6c146422
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Setting default distribution to lenny.
 
@@ -214,7 +214,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 5 insertions(+), 1 deletions(-)
 
 commit 20aad4c211bb423d714a38728ffccea5757840a2
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Removing both required local and d-i udebs when using live-installer.
 
@@ -222,7 +222,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 6 insertions(+), 0 deletions(-)
 
 commit c338316ee23fbf687fc4554765c24887cee2fd1a
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Added forgotten path to bootstrap-base removal.
 
@@ -230,7 +230,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 commit 789677ab838dc589ef954ff4745609e22d9d6d6e
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Simplifying debian-installer download.
 
@@ -238,7 +238,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 4 insertions(+), 18 deletions(-)
 
 commit 0e4a03132a9cb16779d41022ff9f518694295ab6
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Adding support for live-installer.
 
@@ -247,7 +247,7 @@ Author: Daniel Baumann <daniel@debian.org>
  2 files changed, 13 insertions(+), 7 deletions(-)
 
 commit 117d1ef02c09404d595a27023e86765841909398
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Polishing and updating with recent news.
 
@@ -255,7 +255,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 17 insertions(+), 11 deletions(-)
 
 commit 173bd27953afd4020f2ac5700b147e41af727735
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Temporarily disabling extended options, they seem to make problems and need testing.
 
@@ -263,7 +263,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 8 insertions(+), 8 deletions(-)
 
 commit 508cf68252a5253ba40fcaa0dc46a3ffffc3dbfa
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Adding Rene Merou <ochominutosdearco@gmail.com>.
 
@@ -271,7 +271,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 commit 7c25acdfc10c851bc30ccafc273a71113758f175
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Added Spanish syslinux templates translation from Rene Merou <ochominutosdearco@gmail.com>.
 
@@ -297,7 +297,7 @@ Author: Daniel Baumann <daniel@debian.org>
  19 files changed, 421 insertions(+), 0 deletions(-)
 
 commit 8407eb17e393c18ce76afe3fc3d48a5128c22344
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Added Catalan syslinux templates translation from Rene Merou <ochominutosdearco@gmail.com>.
 
@@ -323,7 +323,7 @@ Author: Daniel Baumann <daniel@debian.org>
  19 files changed, 423 insertions(+), 0 deletions(-)
 
 commit 78450950715061a76a7f3bc02bb5bc4b6d21545e
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Setting default language to 'en'.
 
@@ -351,7 +351,7 @@ Author: Daniel Baumann <daniel@debian.org>
  21 files changed, 458 insertions(+), 1 deletions(-)
 
 commit 3fddecbe0eab7d49fb67800bec436d9caa72dfa5
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Supporting localized syslinux templates based on LH_LANGUAGE.
 
@@ -381,7 +381,7 @@ Author: Daniel Baumann <daniel@debian.org>
  23 files changed, 6 insertions(+), 460 deletions(-)
 
 commit 1956c132a8bac04cd3a025f60acdadb8fa9dd668
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Adding forgotten cp call.
 
@@ -389,7 +389,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 commit f4af8492a6738f873237802e5dd2005e3ca5bab2
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Removing cruft from debian-cd templates.
 
@@ -401,7 +401,7 @@ Author: Daniel Baumann <daniel@debian.org>
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 9ec9d931e7809058a4d35991c07af1057d7db875
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Using new Homepage field now.
 
@@ -409,7 +409,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 1 insertions(+), 2 deletions(-)
 
 commit 9da34f5a3bbd3eaa4ea9f1f91d8a8748ce94f068
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Adding Marco Amadori <marco.amadori@gmail.com>.
 
@@ -417,7 +417,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 commit 83fc7ca480fb36e40e21dad7c892ec92cf8c3679
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Downgrading Ubuntu minimal requirements from gutsy to feisty.
 
@@ -425,7 +425,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 23c269f3afba1449f2ff6352bf9504fbdba582f8
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Simplyfing LH_BASE calls.
 
@@ -433,7 +433,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 16b85ffe14a24a693cfdafa2d100f96d5d65cf0a
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Using udeb_include files from debian-cd.
 
@@ -441,7 +441,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 3 insertions(+), 25 deletions(-)
 
 commit e9ed48833fee3e9232917282f0af88d39bca673e
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Using Debian terminology for images of unreleased suites.
 
@@ -450,7 +450,7 @@ Author: Daniel Baumann <daniel@debian.org>
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit 6c45ff08704bd84fd7c45b294e843c642cc17a16
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Setting debian-installer default flavour to netinst.
 
@@ -459,7 +459,7 @@ Author: Daniel Baumann <daniel@debian.org>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 04f8e669b49da796863e2f548620ee5f15494b2d
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Adding forgotten handling of default case.
 
@@ -467,7 +467,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 9 insertions(+), 2 deletions(-)
 
 commit 9f59f16c7c1da6cd227fa47897dc76bf8004cb8e
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Only removing old packages if they exist.
 
@@ -475,7 +475,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 7 insertions(+), 4 deletions(-)
 
 commit 471b32c6821eea5d1a73c62c16eb31defe9c0895
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Fixing typing error.
 
@@ -483,7 +483,7 @@ Author: Daniel Baumann <daniel@debian.org>
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 commit fbd4861b2347b024caa54af443b18ca1c6646a31
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 
     Preparing live-helper 1.0~a28-1.
 
@@ -513,7 +513,7 @@ Author: Daniel Baumann <daniel@debian.org>
  manpages/live-helper.de.7               |    2 +-
  manpages/live-helper.en.7               |    2 +-
  25 files changed, 32 insertions(+), 26 deletions(-)
-2007-09-09  Daniel Baumann  <daniel@debian.org>
+2007-09-09  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Fixing typing error.
@@ -536,13 +536,13 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Moving from svn to git.
 	* Uploading 1.0~a27-1.
 
-2007-09-04  Daniel Baumann  <daniel@debian.org>
+2007-09-04  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_chroot_cache:
 	  - Added forgotten creation of the stagefile as mentioned by
 	    Peter Holik <peter@holik.at>.
 
-2007-09-04  Daniel Baumann  <daniel@debian.org>
+2007-09-04  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_syslinux, lh_config:
 	  - Applied fixes from Peter Holik <peter@holik.at>.
@@ -554,7 +554,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	    Peter Holik <peter@holik.at>.
 	* Uploading 1.0~a26-1.
 
-2007-08-28  Daniel Baumann  <daniel@debian.org>
+2007-08-28  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Prefering debootstrap over cdebootstrap.
@@ -564,13 +564,13 @@ Author: Daniel Baumann <daniel@debian.org>
 	    same config directory.
 	* Uploading 1.0~a25-1.
 
-2007-08-28  Daniel Baumann  <daniel@debian.org>
+2007-08-28  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_clean:
 	  - Accepting more than one parameter at the same time.
 	* Uploading 1.0~a24-1.
 
-2007-08-14  Daniel Baumann  <daniel@debian.org>
+2007-08-14  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/*:
 	  - Added --conffile to all helpers.
@@ -578,31 +578,31 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added.
 	* Uploading 1.0~a23-1.
 
-2007-08-13  Daniel Baumann  <daniel@debian.org>
+2007-08-13  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_memtest:
 	  - Improved grub workaround.
 
-2007-08-12  Daniel Baumann  <daniel@debian.org>
+2007-08-12  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_chroot_dpkg:
 	  - Added.
 
-2007-08-12  Daniel Baumann  <daniel@debian.org>
+2007-08-12  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Uploaded 1.0~a22-1.
 
-2007-08-08  Daniel Baumann  <daniel@debian.org>
+2007-08-08  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/lh_chroot_hacks:
 	  - Remove resume partition configuration in initramfs on etch.
 
-2007-08-07  Daniel Baumann  <daniel@debian.org>
+2007-08-07  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Added auto mode for LH_INITRAMFS.
 
-2007-08-05  Daniel Baumann  <daniel@debian.org>
+2007-08-05  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Added debian-edu mode.
@@ -614,7 +614,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	* lists/studio, studio-gnome, studio-kde, studio-xfce:
 	  - Added.
 
-2007-08-04  Daniel Baumann  <daniel@debian.org>
+2007-08-04  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/*, helpers/*:
 	  - Renaming LIVE_* variables to LH_*.
@@ -640,12 +640,12 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Replaced with a dummy: make-live is deprecated now, use lh_config
 	    and lh_build instead.
 
-2007-08-03  Daniel Baumann  <daniel@debian.org>
+2007-08-03  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_chroot_apt:
 	  - Updated configuration of recommends handling for apt.
 
-2007-07-29  Daniel Baumann  <daniel@debian.org>
+2007-07-29  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/packages.sh:
 	  - Using dpkg-query to check for packages when building in chroot,
@@ -654,7 +654,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added missing NAME.
 	* Uploaded 1.0~a21-1.
 
-2007-07-28  Daniel Baumann  <daniel@debian.org>
+2007-07-28  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/chroot.sh:
 	  - Added XORG_CONFIG="custom" to chroot call in order to disable
@@ -662,7 +662,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	* helpers/lh_binary_usb-hdd:
 	  - Fixes for binary non-chroot build.
 
-2007-07-27  Daniel Baumann  <daniel@debian.org>
+2007-07-27  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Makefile, debian/postinst, prerm:
 	  - Added alternatives handling for includes and templates.
@@ -684,7 +684,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - synced usage message and getopts parsing (Closes and extends
 	    #434481).
 
-2007-07-19  Daniel Baumann  <daniel@debian.org>
+2007-07-19  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh, package.sh, helpers/lh_config, lh_binary_*:
 	  - Added support for non-chrooted build.
@@ -701,7 +701,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	    distributions.
 	* Uploaded 1.0~a19-1.
 
-2007-07-15  Daniel Baumann  <daniel@debian.org>
+2007-07-15  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* examples/cron/manpages.sh, examples/hooks/win32-loader.sh:
 	  - Added.
@@ -716,7 +716,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Changed code to use the new TEMPLATES variable and avoid
 	    hardcoding the path.
 
-2007-07-14  Daniel Baumann  <daniel@debian.org>
+2007-07-14  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_debian-installer:
 	  - Addded 'live' mode.
@@ -725,7 +725,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Moved copying of parameters.txt to lh_binary_linux-image.
 	  - Moved parameters.txt.* to live-initramfs and data/casper.
 
-2007-07-12  Daniel Baumann  <daniel@debian.org>
+2007-07-12  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_grub, lh_binary_syslinux:
 	  - Also respect local menu.lst and syslinux.cfg.
@@ -748,7 +748,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Altered LH_DEBCONF_NOWARNINGS so that it accepts "enabled/disabled"
 	  as well as "yes/no" for consistency.
 
-2007-07-09  Daniel Baumann  <daniel@debian.org>
+2007-07-09  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/architecture.sh, helpers/lh_binary_debian-installer,
 	  lh_binary_grub, lh_binary_linux-image, lh_binary_memtest,
@@ -757,7 +757,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	* helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
 	  - Added priority=critical for auto/autogui boot labels.
 
-2007-07-07  Daniel Baumann  <daniel@debian.org>
+2007-07-07  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_chroot:
 	  - Going back to full copy instead of hardlinks.
@@ -802,7 +802,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	* hooks/mini, hooks/minimal:
 	  - Do not fail if the package isn't installed.
 
-2007-07-04  Daniel Baumann  <daniel@debian.org>
+2007-07-04  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Added architecture handling to mirror defaults.
@@ -816,13 +816,13 @@ Author: Daniel Baumann <daniel@debian.org>
 	* helpers/lh_binary_syslinux:
 	  - Fix paths for kernel and initrd image loading.
 
-2007-07-02  Daniel Baumann  <daniel@debian.org>
+2007-07-02  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_grub:
 	  - Also respect splash.xpm and not just splash.xpm.gz as local grub
 	    splash images.
 
-2007-07-01  Daniel Baumann  <daniel@debian.org>
+2007-07-01  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_debian-installer:
 	  - Added caching of udebs.
@@ -831,13 +831,13 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added support for aufs.
 	* Uploaded 1.0~a17-1.
 
-2007-06-30  Daniel Baumann  <daniel@debian.org>
+2007-06-30  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/releases.sh, helpers/lh_binary_disk, lh_source_disk,
 	  lh_chroot_hostname:
 	  - Added.
 
-2007-06-29  Daniel Baumann  <daniel@debian.org>
+2007-06-29  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_syslinux:
 	  - Fixed damaged memtest entry.
@@ -872,7 +872,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  helpers/lh_binary_yaboot:
 	  - Use the new Check_templates method to avoid duplicated code.
 
-2007-06-25  Daniel Baumann  <daniel@debian.org>
+2007-06-25  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_local-hooks:
 	  - Added.
@@ -892,12 +892,12 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Translated existing lists to be include-based, added a few missing
 	    lists.
 
-2007-06-18  Daniel Baumann  <daniel@debian.org>
+2007-06-18  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/*:
 	  - All cache operations use hardlinks now.
 
-2007-06-16  Daniel Baumann  <daniel@debian.org>
+2007-06-16  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_bootstrap_clone, lh_bootstrap_copy:
 	  - Added.
@@ -905,7 +905,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added.
 	* Uploaded 1.0~a15-1.
 
-2007-06-10  Daniel Baumann  <daniel@debian.org>
+2007-06-10  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/*:
 	  - Excluding lenny from the syslinux workarounds as syslinux 3.36 did
@@ -918,7 +918,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Including script to write grub to the loop device from Thomas Lange
 	    <lange@informatik.uni-koeln.de>.
 
-2007-06-10  Daniel Baumann  <daniel@debian.org>
+2007-06-10  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_grub, lh_binary_rootfs, lh_binary_yaboot,
 	  lh_binary_syslinux:
@@ -929,20 +929,20 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added.
 	* Uploaded 1.0~a14-1.
 
-2007-06-08  Daniel Baumann  <daniel@debian.org>
+2007-06-08  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/make-live:
 	  - Adjusted reading of configuration to match the previously renamed
 	    files.
 
-2007-06-04  Daniel Baumann  <daniel@debian.org>
+2007-06-04  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_hdd, lh_source_hdd:
 	  - Renamed to lh_binary_tar and lh_source_tar.
 	* helpers/lh_source_generic:
 	  - Removed.
 
-2007-06-03  Daniel Baumann  <daniel@debian.org>
+2007-06-03  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Uploaded 1.0~a13-1.
 
@@ -952,7 +952,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Use {Check,Install,Remove}_package to handle debconf dependency.
 	* Add support to specify the apt/aptitude pipeline depth.
 
-2007-06-02  Daniel Baumann  <daniel@debian.org>
+2007-06-02  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Applied patches from Otavio Salvador <otavio@debian.org>:
 	  - Add support to override helpers base directory
@@ -960,7 +960,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Add support to specify the keyring to be used while bootstraping.
 	  - Add lh_chroot_preseed helper.
 
-2007-05-28  Daniel Baumann  <daniel@debian.org>
+2007-05-28  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/*:
 	  - Added initial P: messages.
@@ -970,20 +970,20 @@ Author: Daniel Baumann <daniel@debian.org>
 	* lists/mini, minimal:
 	  - Removed, already pulled in with live-initramfs depends.
 
-2007-05-27  Daniel Baumann  <daniel@debian.org>
+2007-05-27  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_rootfs:
 	  - Added check for config/binary_rootfs/squashfs.sort for passing a
 	    sorting list to mksquashfs.
 
-2007-05-26  Daniel Baumann  <daniel@debian.org>
+2007-05-26  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* lists/rescue:
 	  - Updated with suggestions from Inigo Tejedor Arrondo
 	    <inigo@navarrux.org>
 	* Uploaded 1.0~a12-1.
 
-2007-05-25  Daniel Baumann  <daniel@debian.org>
+2007-05-25  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Updated check for LH_BOOTSTRAP on ubuntu.
@@ -991,7 +991,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added configuration support for ISO application, preparer and
 	    publisher field.
 
-2007-05-24  Daniel Baumann  <daniel@debian.org>
+2007-05-24  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_syslinux:
 	  - Added dedicated directory handling for syslinux (>= 3.36) on usb.
@@ -1000,7 +1000,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added legacy support for syslinux (<< 3.36).
 	* Uploaded 1.0~a11-1.
 
-2007-05-18  Daniel Baumann  <daniel@debian.org>
+2007-05-18  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/*:
 	  - Renamed LIVE_KERNEL_FLAVOUR to LIVE_LINUX_FLAVOURS.
@@ -1022,13 +1022,13 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Changed behavior of beryl hook: autostart beryl
 	    if video driver allows it (minimal detection based on glxinfo)
 
-2007-05-17  Daniel Baumann  <daniel@debian.org>
+2007-05-17  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_md5sum, lh_source,md5sum:
 	  - Fixed accidentally inclusion of md5sum.txt itself into
 	    binary/md5sum.txt.
 
-2007-05-16  Daniel Baumann  <daniel@debian.org>
+2007-05-16  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/*:
 	  - Added check for local includes and templates.
@@ -1042,7 +1042,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Renamed lh_source_download to lh_source_debian.
 	  - Renamed lh_source_config to lh_source_debian-live.
 
-2007-05-09  Daniel Baumann  <daniel@debian.org>
+2007-05-09  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/*:
 	  - Renamed LH_MIRROR*_BUILD to LH_MIRROR*_BOOTSTRAP.
@@ -1051,7 +1051,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added aptitude overwrite for untrusted sources.
 	  - Changed checks for *.build/*.image to *.bootstrap/*.binary.
 
-2007-05-08  Daniel Baumann  <daniel@debian.org>
+2007-05-08  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/*:
 	  - Renamed lh_binary_linuximage to lh_binary_linux-image.
@@ -1062,14 +1062,14 @@ Author: Daniel Baumann <daniel@debian.org>
 	  lh_binary_memtest:
 	  - Changed kernel installation directories.
 
-2007-05-07  Daniel Baumann  <daniel@debian.org>
+2007-05-07  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* examples/snapshot-build.sh, live-snapshot.sources.list:
 	  - Added.
 	* helpers/lh_binary_rootfs:
 	  - Fixed wrong order of squashfs options.
 
-2007-05-06  Daniel Baumann  <daniel@debian.org>
+2007-05-06  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* templates/syslinux:
 	  - Updated again.
@@ -1080,39 +1080,39 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Working arround symlinks on usb-hdd binary images.
 	* Uploaded 1.0~a9-1.
 
-2007-04-31  Daniel Baumann  <daniel@debian.org>
+2007-04-31  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/*:
 	  - Added LH_INITRAMFS.
 	  - Splitted config/image into config/binary and config/source.
 	* Uploaded 1.0~a8-1.
 
-2007-04-26  Daniel Baumann  <daniel@debian.org>
+2007-04-26  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/*:
 	  - Implemented paranoid caching with LIVE_CACHE_INDICES,
 	    LIVE_CACHE_PACKAGES and LIVE_CACHE_STAGES. This allows to build
 	    images offline from the cache.
 
-2007-04-25  Daniel Baumann  <daniel@debian.org>
+2007-04-25  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_usb, lh_source_usb:
 	  - In preparation of adding support for usb-zip images, the usb binary
 	    type is renamed to usb-hdd.
 
-2007-04-24  Daniel Baumann  <daniel@debian.org>
+2007-04-24  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/stagefile.sh:
 	  - Requite_stagefile can require more than one stage.
 	* helpers/lh_binary_debian-installer:
 	  - Added.
 
-2007-04-23  Daniel Baumann  <daniel@debian.org>
+2007-04-23  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_includes, lh_binary_usb, lh_source_usb:
 	  - Added workaround for vfat limitations.
 
-2007-04-23  Daniel Baumann  <daniel@debian.org>
+2007-04-23  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Makefile:
 	  - Added simple test rule.
@@ -1125,7 +1125,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added trap to unmount proc and sys on exit and failure.
 	* Uploaded 1.0~a7-1.
 
-2007-04-22  Daniel Baumann  <daniel@debian.org>
+2007-04-22  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - In ubuntu mode, setting default sections to main restricted.
@@ -1135,17 +1135,17 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - In debian mode, checking for non-sid rather than if-etch.
 	  - Fixed wrong Ubuntu security URL.
 
-2007-04-20  Daniel Baumann  <daniel@debian.org>
+2007-04-20  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_rootfs, lh_binary_iso:
 	  - Added mksquashfs/genisoimage quiet/verbose options.
 
-2007-04-19  Daniel Baumann  <daniel@debian.org>
+2007-04-19  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_grub, lh_binary_syslinux:
 	  - Added check for splash in config directory.
 
-2007-04-18  Daniel Baumann  <daniel@debian.org>
+2007-04-18  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* debian/cron.daily, default:
 	  - Added.
@@ -1157,7 +1157,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added language suffix.
 	  - Added German translations.
 
-2007-04-17  Daniel Baumann  <daniel@debian.org>
+2007-04-17  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_chroot_hooks:
 	  - Also check for tasks specific hooks, not just for package lists.
@@ -1168,7 +1168,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	* manpages/lh_build.1, lh_source.1:
 	  - Added.
 
-2007-04-16  Daniel Baumann  <daniel@debian.org>
+2007-04-16  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Using lsb_release, if existing, to set default mode to ubuntu on
@@ -1179,7 +1179,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added simple --hooks for easy testing.
 	* Uploaded 1.0~a6-1.
 
-2007-04-15  Daniel Baumann  <daniel@debian.org>
+2007-04-15  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Set LH_APT to apt-get when using mini or minimal.
@@ -1188,7 +1188,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	* helpers/lh_bootstrap_cdebootstrap:
 	  - Removing imported configuration files by cdebootstrap.
 
-2007-04-13  Daniel Baumann  <daniel@debian.org>
+2007-04-13  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Moved examples from /usr/share/doc to /usr/share/live-helper.
 	* examples/bpo.sources.list:
@@ -1198,7 +1198,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	* helpers/lh_clean:
 	  - Added missing removal of generic source.
 
-2007-04-12  Daniel Baumann  <daniel@debian.org>
+2007-04-12  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_config, make-live:
 	  - Adding --config.
@@ -1208,7 +1208,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Setting default distribution to etch until 2.6.20 has setteled in
 	    unstable.
 
-2007-04-11  Daniel Baumann  <daniel@debian.org>
+2007-04-11  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Merging from sidux fllbuilder 1.0.4:
 	  - functions/chroot: Added LH_DEBCONF_NOWARNINGS.
@@ -1229,17 +1229,17 @@ Author: Daniel Baumann <daniel@debian.org>
 	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
 	  - Added.
 
-2007-04-10  Daniel Baumann  <daniel@debian.org>
+2007-04-10  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_includes, includes/*:
 	  - Redone.
 
-2007-04-09  Daniel Baumann  <daniel@debian.org>
+2007-04-09  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_yaboot, templates/yaboot:
 	  - Added.
 
-2007-04-09  Daniel Baumann  <daniel@debian.org>
+2007-04-09  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_config, make-live, functions/defaults.sh:
 	  - Added mode to distinguish between Debian and Ubuntu.
@@ -1248,14 +1248,14 @@ Author: Daniel Baumann <daniel@debian.org>
 	    LIVE_MIRROR_IMAGE*.
 	* Uploaded 1.0~a5-1.
 
-2007-04-08  Daniel Baumann  <daniel@debian.org>
+2007-04-08  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_net:
 	  - Added check for namespace collision with LIVE_SERVER_PATH.
 	* helpers/lh_binary_grub:
 	  - Added functionality for usb|hdd images.
 
-2007-04-07  Daniel Baumann  <daniel@debian.org>
+2007-04-07  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_chroot_sources:
 	  - Moved check for local source lists from
@@ -1267,7 +1267,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	    config/chroot_sources/*.deb.
 	  - Added LIVE_KEYRING_PACKAGES.
 
-2007-04-06  Daniel Baumann  <daniel@debian.org>
+2007-04-06  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/breakpoints.sh, helpers/*:
 	  - Added initial breakpoints.
@@ -1280,37 +1280,37 @@ Author: Daniel Baumann <daniel@debian.org>
 	* manpages/*:
 	  - Updated.
 
-2007-04-05  Daniel Baumann  <daniel@debian.org>
+2007-04-05  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_grub, templates/grub/menu.lst:
 	  - Added splash functionality.
 	* Uploaded 1.0~a4-1.
 
-2007-04-03  Daniel Baumann  <daniel@debian.org>
+2007-04-03  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_grub, lh_binary_grub:
 	  - Added check for LIVE_TEMPLATES to be existing.
 	* helpers/lh_binary_includes:
 	  - Added check for LIVE_INCLUDES to be existing.
 
-2007-04-02  Daniel Baumann  <daniel@debian.org>
+2007-04-02  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/*, helpers/*:
 	  - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER.
 	* helpers/lh_binary_iso:
 	  - Added exclude for the bootloader from the iso image content.
 
-2007-04-01  Daniel Baumann  <daniel@debian.org>
+2007-04-01  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helper/lh_binary_grub:
 	  - Added.
 
-2007-03-30  Daniel Baumann  <daniel@debian.org>
+2007-03-30  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helper/lh_chroot_localincludes:
 	  - Fixed wrong path for hook removal.
 
-2007-03-29  Daniel Baumann  <daniel@debian.org>
+2007-03-29  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/common.sh, echo.sh:
 	  - Added.
@@ -1323,17 +1323,17 @@ Author: Daniel Baumann <daniel@debian.org>
 	* manpages/lh_chroot.1:
 	  - Added.
 
-2007-03-28  Daniel Baumann  <daniel@debian.org>
+2007-03-28  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
 	  - Added --debug, --quiet, and --verbose.
 
-2007-03-27  Daniel Baumann  <daniel@debian.org>
+2007-03-27  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_linuximage, lh_binary_memtest86:
 	  - Added missing Read_conffiles to fix foreign architecture builds.
 
-2007-03-26  Daniel Baumann  <daniel@debian.org>
+2007-03-26  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap,
 	  lh_clean:
@@ -1344,13 +1344,13 @@ Author: Daniel Baumann <daniel@debian.org>
 	* lists/gnome*, kde*, standard-x11, xfce*:
 	  - Added menu.
 
-2007-03-26  Daniel Baumann  <daniel@debian.org>
+2007-03-26  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Fixed handling of desktop list variable loop.
 	* Uploaded 1.0~a3-1.
 
-2007-03-25  Daniel Baumann  <daniel@debian.org>
+2007-03-25  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/*, helpers/*:
 	  - Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR.
@@ -1381,7 +1381,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	* lists/minimal-net:
 	  - Minimized.
 
-2007-03-24  Daniel Baumann  <daniel@debian.org>
+2007-03-24  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/*, helpers/*, hooks/*:
 	  - Added GPL blurb.
@@ -1399,12 +1399,12 @@ Author: Daniel Baumann <daniel@debian.org>
 	* helpers/lh_clean:
 	  - Added purge.
 
-2007-03-23  Daniel Baumann  <daniel@debian.org>
+2007-03-23  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/make-live:
 	  - Calling Arguments twice to catch case with non-default root.
 
-2007-03-22  Daniel Baumann  <daniel@debian.org>
+2007-03-22  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/default.sh, helpers/*:
 	  - Renamed lh_chroot_packageslist to lh_chroot_packageslists and
@@ -1417,7 +1417,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as
 	    local packages.
 
-2007-03-21  Daniel Baumann  <daniel@debian.org>
+2007-03-21  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb:
 	  - Checking earlier if there is something todo.
@@ -1436,28 +1436,28 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and
 	    LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE.
 
-2007-03-20  Daniel Baumann  <daniel@debian.org>
+2007-03-20  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/make-live:
 	  - Fixed typo in ARGUMENTS.
 
-2007-03-19  Daniel Baumann  <daniel@debian.org>
+2007-03-19  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* lists/gnome*, kde*, standard-x11, xfce*:
 	  - Added alsa-base, alsa-oss, alsa-utils, and discover.
 
-2007-03-19  Daniel Baumann  <daniel@debian.org>
+2007-03-19  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Uploaded 1.0~a2-1.
 
-2007-03-18  Daniel Baumann  <daniel@debian.org>
+2007-03-18  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Quoted date call in LIVE_ISO_VOLUME.
 	* manpages/lh_clean.1:
 	  - Added.
 
-2007-03-17  Daniel Baumann  <daniel@debian.org>
+2007-03-17  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh, helpers/*:
 	  - Renamed LIVE_MIRROR to LIVE_MIRROR_LOCAL and LIVE_MIRROR_SECURITY
@@ -1479,11 +1479,11 @@ Author: Daniel Baumann <daniel@debian.org>
 	* templates/syslinux/pxlinux.cfg:
 	  - Fixed path.
 
-2007-03-16  Daniel Baumann  <daniel@debian.org>
+2007-03-16  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_binary_usb: Corrected stagefile creation.
 
-2007-03-15  Daniel Baumann  <daniel@debian.org>
+2007-03-15  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Makefile:
 	  - Replaced helper uninstall routine with a less intrusive one.
@@ -1527,7 +1527,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	* templates/syslinux/f10.txt:
 	  - Added note about Debian Live project.
 
-2007-03-14  Daniel Baumann  <daniel@debian.org>
+2007-03-14  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh, helpers/*:
 	  - Converted LIVE_ROOT to directory, not full path.
@@ -1540,13 +1540,13 @@ Author: Daniel Baumann <daniel@debian.org>
 	* helpers/lh_source_download:
 	  - Fixed typo in old source removal.
 
-2007-03-14  Daniel Baumann  <daniel@debian.org>
+2007-03-14  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* helpers/lh_chroot_hacks:
 	  - Added removal of udev persistent-net rule.
 	* Uploaded 1.0~a1-3.
 
-2007-03-14  Daniel Baumann  <daniel@debian.org>
+2007-03-14  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* functions/defaults.sh:
 	  - Fixed setting of LIVE_SYSVINIT.
@@ -1554,7 +1554,7 @@ Author: Daniel Baumann <daniel@debian.org>
 	  - Changed check for LIVE_SYSVINIT from disabled to enabled.
 	* Uploaded 1.0~a1-2.
 
-2007-03-12  Daniel Baumann  <daniel@debian.org>
+2007-03-12  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Rewritten live-package.
 	* Uploaded 1.0~a1-1.
diff --git a/docs/ChangeLog.live-package b/docs/ChangeLog.live-package
index 03dba6415..31ab7b434 100644
--- a/docs/ChangeLog.live-package
+++ b/docs/ChangeLog.live-package
@@ -1,12 +1,12 @@
-2007-03-10 Daniel Baumann <daniel@debian.org>
+2007-03-10 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added knoppix and knoppix-dvd package lists.
 
-2007-03-09 Daniel Baumann <daniel@debian.org>
+2007-03-09 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Getting free loopdevice from inside the chroot, not outside.
 
-2007-03-09 Daniel Baumann <daniel@debian.org>
+2007-03-09 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added kbd to all !minimal lists.
 	* Uploaded 0.99.25.
@@ -17,7 +17,7 @@
 	  recommended packages to get installed.
 	* src/scripts/02defaults.sh: Export LIVE_ISOLINUX_SPLASH.
 
-2007-03-04 Daniel Baumann <daniel@debian.org>
+2007-03-04 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Replaced removal of kernel on minimal flavours with excludes on the
 	  mksquashfs call.
@@ -29,36 +29,36 @@
 	  <hendry@iki.fi>.
 	* Uploaded 0.99.24.
 
-2007-02-22 Daniel Baumann <daniel@debian.org>
+2007-02-22 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added xresprobe to all x11 lists.
 
-2007-02-22 Daniel Baumann <daniel@debian.org>
+2007-02-22 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Applied patches from Otavio Salvador <otavio@debian.org>:
 	  - add and cleanup variable exporting in defaults.
 	  - add LIVE_BOOTSTRAP_CONFIG to lh_debootstrap.
 	* Uploaded 0.99.23.
 
-2007-02-21 Daniel Baumann <daniel@debian.org>
+2007-02-21 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added gnome-junior, kde-junior and xfce-junior lists.
 	* Uploaded 0.99.22.
 
-2007-02-19 Daniel Baumann <daniel@debian.org>
+2007-02-19 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Fixed manifest.
 
-2007-02-15 Daniel Baumann <daniel@debian.org>
+2007-02-15 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Applied patch from Sebastian Raveau <sebastien.raveau@epita.fr> to
 	  add support for filesystem images encrypted with loop-aes.
 
-2007-02-13 Daniel Baumann <daniel@debian.org>
+2007-02-13 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Broken out scripts into modularized lh_* subscripts.
 
-2007-02-12 Daniel Baumann <daniel@debian.org>
+2007-02-12 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added some code as suggested by Alex Owen <r.a.owen@qmul.ac.uk> to
 	  check if the depends (syslinux, memtest etc.) are intentionally
@@ -66,55 +66,55 @@
 	* Moved some depends into the chroot.
 	* Uploaded 0.99.21.
 
-2007-02-11 Daniel Baumann <daniel@debian.org>
+2007-02-11 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added mini flavour.
 
-2007-02-10 Daniel Baumann <daniel@debian.org>
+2007-02-10 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added legacy code for genisoimage.
 	* Uploaded 0.99.20.
 
-2007-02-09 Daniel Baumann <daniel@debian.org>
+2007-02-09 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added usb type.
 
-2007-02-08 Daniel Baumann <daniel@debian.org>
+2007-02-08 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added desktop task to the *-desktop flavours.
 
-2007-02-07 Daniel Baumann <daniel@debian.org>
+2007-02-07 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Extended cron job a bit.
 	* Fixed manual pruning in minimal flavour as suggested by Bas Wijnen
 	  <wijnen@debian.org>
 
-2007-02-02 Daniel Baumann <daniel@debian.org>
+2007-02-02 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added "--without-daemons".
 
-2007-02-01 Daniel Baumann <daniel@debian.org>
+2007-02-01 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added "--tasks".
 	* Added desktop-base to all desktop package lists.
 
-2007-01-31 Daniel Baumann <daniel@debian.org>
+2007-01-31 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Changed vars in autobuilding script to be able to source
 	  make-live.conf.
 	* Uploaded 0.99.19.
 
-2007-01-30 Daniel Baumann <daniel@debian.org>
+2007-01-30 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added cron job for autobuilding images.
 
-2007-01-25 Daniel Baumann <daniel@debian.org>
+2007-01-25 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added additional pruning to minimal flavour.
 	* Using interactive frontend while processing --hook.
 	* Uploaded 0.99.18.
 
-2007-01-24 Daniel Baumann <daniel@debian.org>
+2007-01-24 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Applied patches from Otavio Salvador <otavio@debian.org>:
 	  - adding "--keyring" flag.
@@ -124,23 +124,23 @@
 	  - adding LIVE_ISOLINUX_SPLASH.
 	* Uploaded 0.99.17.
 
-2007-01-19 Daniel Baumann <daniel@debian.org>
+2007-01-19 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Replacing mkisofs with genisoimage.
 
-2007-01-18 Daniel Baumann <daniel@debian.org>
+2007-01-18 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Cleanups.
 	* Uploaded 0.99.16.
 
-2007-01-16 Daniel Baumann <daniel@debian.org>
+2007-01-16 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Switched default distribution back to unstable, as unstable is usable
 	  again from the kernel point of view.
 	* Added file to the minimal package list.
 	* Uploaded 0.99.15.
 
-2007-01-04 Daniel Baumann <daniel@debian.org>
+2007-01-04 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added workaround for new xorg packages by including
 	  xserver-xorg-input-all and xserver-xorg-video-all in all X11 package
@@ -148,51 +148,51 @@
 	* Added xdebconfigurator to all X11 package lists.
 	* Adding workaround for initrd backup files.
 
-2006-11-06 Daniel Baumann <daniel@debian.org>
+2006-11-06 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Uploaded 0.99.14.
 
-2006-11-05 Daniel Baumann <daniel@debian.org>
+2006-11-05 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Applied patch from Markus Bauer <bauer-markus@web.de>:
 	  - fixing script sourcing to exclude files in .svn
 
-2006-11-03 Daniel Baumann <daniel@debian.org>
+2006-11-03 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Fixed typo in the policy-rc.d hack.
 
-2006-11-02 Daniel Baumann <daniel@debian.org>
+2006-11-02 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Using aptitude instead of apt-get.
 	* Added '--with-recommends' and '--without-recommends'.
 
-2006-11-01 Daniel Baumann <daniel@debian.org>
+2006-11-01 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Fixed regression when using -d ${CODENAME} wrt/ kernel packages.
 
-2006-10-30 Daniel Baumann <daniel@debian.org>
+2006-10-30 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Uploaded 0.99.13.
 
-2006-10-29 Daniel Baumann <daniel@debian.org>
+2006-10-29 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added minimal-net flavour.
 
-2006-10-28 Daniel Baumann <daniel@debian.org>
+2006-10-28 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added console-common to standard selection.
 
-2006-10-27 Daniel Baumann <daniel@debian.org>
+2006-10-27 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added patch from Otavio Salvador <otavio@debian.org>:
 	  - fixing preseeding error-handling.
 
-2006-10-26 Daniel Baumann <daniel@debian.org>
+2006-10-26 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added gnustep package selection based on the suggestion of
 	  Guerkan Senguen <gurkan@linuks.mine.nu>.
 
-2006-10-25 Daniel Baumann <daniel@debian.org>
+2006-10-25 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Applied patch from Marcelo D. Re <mdre@rectorado.unl.edu.ar>:
 	  - skip deb-src source-list entries when building images with
@@ -206,44 +206,44 @@
 	  - allowing override of kernel-packages.
 	* Reverted mangling of LIVE_DISTRIBUTION for sources.list generation.
 
-2006-10-23 Daniel Baumann <daniel@debian.org>
+2006-10-23 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Uploaded 0.99.12.
 
-2006-10-18 Daniel Baumann <daniel@debian.org>
+2006-10-18 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Autodetecting proxy now.
 
-2006-10-16 Daniel Baumann <daniel@debian.org>
+2006-10-16 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Readded and slightly changed --clone and --preseed.
 	* Uploaded 0.99.11.
 
-2006-10-09 Daniel Baumann <daniel@debian.org>
+2006-10-09 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Cleanups.
 	* Uploaded 0.99.10.
 
-2006-10-02 Daniel Baumann <daniel@debian.org>
+2006-10-02 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Uploaded 0.99.9.
 
-2006-10-01 Daniel Baumann <daniel@debian.org>
+2006-10-01 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added multiple repositories.
 	* Using LIVE_PROXY_* also for bootstraping.
 
-2006-09-27 Daniel Baumann <daniel@debian.org>
+2006-09-27 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Changing manpage section.
 
-2006-09-26 Daniel Baumann <daniel@debian.org>
+2006-09-26 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added default flavour hooks.
 	* minimal flavour does not install debian-archive-keyring to save space.
 	* Adjusted network patch.
 
-2006-09-25 Daniel Baumann <daniel@debian.org>
+2006-09-25 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Removed now unused initramfs-tools hack.
 	* Simplified xorg check based on distribution rather than version.
@@ -257,19 +257,19 @@
 
 	* 13hack.sh: initramfs-tools hack, check added for xorg.
 
-2006-09-18 Daniel Baumann <daniel@debian.org>
+2006-09-18 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Uploaded 0.99.7.
 
-2006-09-15 Daniel Baumann <daniel@debian.org>
+2006-09-15 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added eject to minimal package selection.
 
-2006-09-14 Daniel Baumann <daniel@debian.org>
+2006-09-14 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Adjustements for linux 2.6.17 testing propagation.
 
-2006-09-11 Daniel Baumann <daniel@debian.org>
+2006-09-11 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Uploaded 0.99.6.
 
@@ -278,7 +278,7 @@
 	* 23net.sh: Fixed binary missing directory creation.
 	* templates/iso: Moved common files to templates/common.
 
-2006-09-07 Daniel Baumann <daniel@debian.org>
+2006-09-07 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Minor cleanups.
 	* Fixed dist target.
@@ -289,23 +289,23 @@
 	* 23net.sh: Added 2 variables for basenames to ease readability.
 	* main.sh, 02default.sh: Modified Usage() uses.
 
-2006-09-04 Daniel Baumann <daniel@debian.org>
+2006-09-04 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Uploaded 0.99.5.
 
-2006-09-03 Daniel Baumann <daniel@debian.org>
+2006-09-03 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added dist parameter to easily pull images for live.debian.net.
 	* Added "--output" to specify the image name prefix.
 	* Exclude iso templates for minimal flavour.
 
-2006-09-02 Daniel Baumann <daniel@debian.org>
+2006-09-02 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added experimental as distribution.
 	* Added source image generation.
 	* Using dpkg instead of dpkg-architecture, removed dpkg-dev dependency.
 
-2006-08-31 Daniel Baumann <daniel@debian.org>
+2006-08-31 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added "--disable-generic-indices" and "--enable-generic-indices".
 	* Fixed i18n lists.
@@ -315,7 +315,7 @@
 	* Setting default sources.list while the image generation, restoring
 	  customized ones afterwards.
 
-2006-08-30 Daniel Baumann <daniel@debian.org>
+2006-08-30 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Cleanups:
 	  - moved 14patch_packages.sh to 13hack.sh.
@@ -330,14 +330,14 @@
 	* 13chroot.sh, 14patch_packages.sh: Added a simple system for patching
 	  packages, mainly for xserver-xorg so far.
 
-2006-08-28 Daniel Baumann <daniel@debian.org>
+2006-08-28 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Updated documentation.
 	* Added patch from Alex Owen <r.a.owen@qmul.ac.uk> to update
 	  pxelinux.cfg for NFS root in casper.
 	* Uploaded 0.99.4.
 
-2006-08-27 Daniel Baumann <daniel@debian.org>
+2006-08-27 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Cleanups.
 
@@ -345,14 +345,14 @@
 
 	* Added sysv init blocking policy.
 
-2006-08-22 Daniel Baumann <daniel@debian.org>
+2006-08-22 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Reorganised sources.
 	* Added staging support.
 	* Cleaned up parameter names.
 	* testing is now supported.
 
-2006-08-21 Daniel Baumann <daniel@debian.org>
+2006-08-21 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Uploaded 0.99.3.
 
@@ -361,11 +361,11 @@
 	* Rewrote netboot support.
 	* Added support for pure directory rootfs images.
 
-2006-07-31 Daniel Baumann <daniel@debian.org>
+2006-07-31 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Uploaded 0.99.2.
 
-2006-07-28 Daniel Baumann <daniel@debian.org>
+2006-07-28 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added DEBIAN_FRONTEND to chroots(), now completely non-interactive.
 	* Fixed wrong chroot patch.
@@ -374,19 +374,19 @@
 
 	* Changed amd64 kernel naming scheme.
 
-2006-07-24 Daniel Baumann <daniel@debian.org>
+2006-07-24 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Uploaded 0.99.1.
 
-2006-07-19 Daniel Baumann <daniel@debian.org>
+2006-07-19 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Bugfixes.
 
-2006-07-18 Daniel Baumann <daniel@debian.org>
+2006-07-18 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added iso templates.
 
-2006-07-17 Daniel Baumann <daniel@debian.org>
+2006-07-17 Daniel Baumann <mail@daniel-baumann.ch>
 
 	* Added chroot to 01-patch.sh.
 	* Added "--logfile".
diff --git a/docs/ChangeLog.live-webhelper b/docs/ChangeLog.live-webhelper
index b6e3df7bd..835d4ed54 100644
--- a/docs/ChangeLog.live-webhelper
+++ b/docs/ChangeLog.live-webhelper
@@ -1,5 +1,5 @@
 commit 1f4cf146edbd72a2d61ac2e60324d392569c9f24
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Wed Oct 14 13:35:25 2009 +0200
 
     Updating vcs fields.
@@ -47,7 +47,7 @@ Date:   Wed Nov 26 22:13:57 2008 -0600
     Update Copyright (C) to 2007-2008
 
 commit 5449c921111b2f300006cc41d7b6582270959a82
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Fri Nov 7 18:08:01 2008 +0100
 
     Replacing obsolete dh_clean -k with dh_prep.
@@ -101,81 +101,81 @@ Date:   Mon Sep 8 15:59:08 2008 -0500
     Upgrade variables to have the LH_ prefix for LH_* variable, to work with the current live-helper version.
 
 commit f00e0cb212e0c84268e099ca35ca386982e4d82b
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Sun Sep 7 21:57:51 2008 +0200
 
     Removing currently unused Upstream-Depends field in control.
 
 commit 4c85494fa2907a54dd99eaf17816a4d403ddb5bc
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Sun Sep 7 21:57:41 2008 +0200
 
     Updating vcs fields in control file.
 
 commit eaf87ebd9f828740430cc60d3e9f201d88c67c25
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Thu Aug 28 23:40:35 2008 +0200
 
     Setting project email address to the new debian-live@lists.debian.org.
 
 commit 6fbca8e14be271dc62988d5555bba9f453ddbaa7
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Wed Apr 23 18:50:17 2008 +0200
 
     Updating Richards email address.
 
 commit 25e1e7bc4f6a095aaf248a80aeaa3795f4a3e3a9
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Tue Oct 30 11:04:42 2007 +0100
 
     Correcting vcs fields.
 
 commit c49d9ff77bd5be73d5367fd567a9e39fccf78410
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Wed Oct 3 09:11:29 2007 +0200
 
     Fixing wrong homepage field.
 
 commit 8e01ba16a737d04a0367ecf1d4f3d7f80437fe97
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Sun Sep 23 16:04:04 2007 +0200
 
     Using new Homepage field now.
 
 commit 49ca83a4d57051b2b4b4b950178063c6df25e222
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Sun Sep 23 16:04:04 2007 +0200
 
     Adding Upstream-Depends field.
 
 commit 39a9d3e82c71451734f0d4ddb630b67c9d55541a
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Sun Sep 23 16:04:04 2007 +0200
 
     Moving from svn to git.
 
 commit 7e823babbe815bdf520becbfd6f4ccec814aa7e2
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Sun Sep 23 16:04:03 2007 +0200
 
     Removing not uploaded versions.
 
 commit 46e8777246485a15fc6d5a202a361662f4e724b5
-Author: Daniel Baumann <daniel@debian.org>
+Author: Daniel Baumann <mail@daniel-baumann.ch>
 Date:   Sun Sep 23 16:03:52 2007 +0200
 
     Adding live-webhelper trunk 20070911.
 
-2007-07-19  Daniel Baumann  <daniel@debian.org>
+2007-07-19  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* Introducing build modes.
 
-2007-07-14  Daniel Baumann  <daniel@debian.org>
+2007-07-14  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* scripts/cgi:
 	  - Quick fix in EMAIL.
 
-2007-06-04  Daniel Baumann  <daniel@debian.org>
+2007-06-04  Daniel Baumann  <mail@daniel-baumann.ch>
 
 	* templates/form.html:
 	  - Set default source image to 'generic'.
diff --git a/examples/hooks/minimal.chroot b/examples/hooks/minimal.chroot
index 5a9a8d648..f219779fa 100755
--- a/examples/hooks/minimal.chroot
+++ b/examples/hooks/minimal.chroot
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/examples/hooks/stripped.chroot b/examples/hooks/stripped.chroot
index 9ebe5bc12..1bad3e623 100755
--- a/examples/hooks/stripped.chroot
+++ b/examples/hooks/stripped.chroot
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/frontends/cgi/live-build-cgi b/frontends/cgi/live-build-cgi
index d6e7f192f..454c8abb2 100755
--- a/frontends/cgi/live-build-cgi
+++ b/frontends/cgi/live-build-cgi
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/frontends/cgi/live-build-cgi.cron b/frontends/cgi/live-build-cgi.cron
index d3e9c3267..7f661002a 100755
--- a/frontends/cgi/live-build-cgi.cron
+++ b/frontends/cgi/live-build-cgi.cron
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/aliases.sh b/functions/aliases.sh
index e6eeccfbb..76d5a1284 100755
--- a/functions/aliases.sh
+++ b/functions/aliases.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/architectures.sh b/functions/architectures.sh
index 800d79df4..a4a41ffed 100755
--- a/functions/architectures.sh
+++ b/functions/architectures.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/arguments.sh b/functions/arguments.sh
index 04feadee8..87e801043 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/breakpoints.sh b/functions/breakpoints.sh
index cab07b0cb..7989b292d 100755
--- a/functions/breakpoints.sh
+++ b/functions/breakpoints.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/cache.sh b/functions/cache.sh
index 0fa93d592..d67716915 100755
--- a/functions/cache.sh
+++ b/functions/cache.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/chroot.sh b/functions/chroot.sh
index 75ffc053e..3dc2a825b 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/color.sh b/functions/color.sh
index 05f877b3a..30adf9e5d 100755
--- a/functions/color.sh
+++ b/functions/color.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/common.sh b/functions/common.sh
index c10b594fe..09cf48c83 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/conffile.sh b/functions/conffile.sh
index 5bb9cce92..81188d84c 100755
--- a/functions/conffile.sh
+++ b/functions/conffile.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/configuration.sh b/functions/configuration.sh
index d956c472e..38c237588 100755
--- a/functions/configuration.sh
+++ b/functions/configuration.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/cursor.sh b/functions/cursor.sh
index a6851ebc1..2f7ad207e 100755
--- a/functions/cursor.sh
+++ b/functions/cursor.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/defaults.sh b/functions/defaults.sh
index c0abfdd78..23a3a31fe 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/echo.sh b/functions/echo.sh
index 8f08d553a..1cba4ccc5 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/exit.sh b/functions/exit.sh
index bde8a2a2b..c1fa3359e 100755
--- a/functions/exit.sh
+++ b/functions/exit.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/help.sh b/functions/help.sh
index 1efd12aad..7d41109e5 100755
--- a/functions/help.sh
+++ b/functions/help.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/lockfile.sh b/functions/lockfile.sh
index 69b56ee5e..7a3107709 100755
--- a/functions/lockfile.sh
+++ b/functions/lockfile.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/losetup.sh b/functions/losetup.sh
index ec727f8ba..a8318f357 100755
--- a/functions/losetup.sh
+++ b/functions/losetup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/man.sh b/functions/man.sh
index 15a357c6d..048cdbe92 100755
--- a/functions/man.sh
+++ b/functions/man.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/packagelists.sh b/functions/packagelists.sh
index 4a0b2b826..d5a2a8c6d 100755
--- a/functions/packagelists.sh
+++ b/functions/packagelists.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/packages.sh b/functions/packages.sh
index b4603a981..c56b54fa8 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/releases.sh b/functions/releases.sh
index 651bb2f09..b166481d5 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/stagefile.sh b/functions/stagefile.sh
index 0ef3dcde2..1ad29e15d 100755
--- a/functions/stagefile.sh
+++ b/functions/stagefile.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/templates.sh b/functions/templates.sh
index c86b87ddf..e89b10682 100755
--- a/functions/templates.sh
+++ b/functions/templates.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/usage.sh b/functions/usage.sh
index 7a0d12777..363630e02 100755
--- a/functions/usage.sh
+++ b/functions/usage.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/functions/wrapper.sh b/functions/wrapper.sh
index e6ed88d36..167df6d95 100755
--- a/functions/wrapper.sh
+++ b/functions/wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index d73c008bc..340505dce 100755
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1
index 765f37469..6bada40bb 100644
--- a/manpages/de/lb.de.1
+++ b/manpages/de/lb.de.1
@@ -44,5 +44,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
-the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
+for the Debian project.
diff --git a/manpages/de/lb_binary.de.1 b/manpages/de/lb_binary.de.1
index c62f507b1..4c47c4b90 100644
--- a/manpages/de/lb_binary.de.1
+++ b/manpages/de/lb_binary.de.1
@@ -43,5 +43,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
-the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
+for the Debian project.
diff --git a/manpages/de/lb_bootstrap.de.1 b/manpages/de/lb_bootstrap.de.1
index fd476b981..1c4ae847c 100644
--- a/manpages/de/lb_bootstrap.de.1
+++ b/manpages/de/lb_bootstrap.de.1
@@ -43,5 +43,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
-the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
+for the Debian project.
diff --git a/manpages/de/lb_build.de.1 b/manpages/de/lb_build.de.1
index 08140eb19..b0bc87090 100644
--- a/manpages/de/lb_build.de.1
+++ b/manpages/de/lb_build.de.1
@@ -45,5 +45,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
-the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
+for the Debian project.
diff --git a/manpages/de/lb_chroot.de.1 b/manpages/de/lb_chroot.de.1
index 3291af269..7db9d7fa2 100644
--- a/manpages/de/lb_chroot.de.1
+++ b/manpages/de/lb_chroot.de.1
@@ -43,5 +43,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
-the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
+for the Debian project.
diff --git a/manpages/de/lb_clean.de.1 b/manpages/de/lb_clean.de.1
index 681ee60ed..40525318f 100644
--- a/manpages/de/lb_clean.de.1
+++ b/manpages/de/lb_clean.de.1
@@ -69,5 +69,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
-the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
+for the Debian project.
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index b12599ac9..7fdba3971 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -776,5 +776,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
-the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
+for the Debian project.
diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1
index cc0abf078..f0294d92a 100644
--- a/manpages/de/lb_source.de.1
+++ b/manpages/de/lb_source.de.1
@@ -43,5 +43,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
-the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
+for the Debian project.
diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1
index a2c5fccb2..1b029207f 100644
--- a/manpages/de/lb_testroot.de.1
+++ b/manpages/de/lb_testroot.de.1
@@ -46,5 +46,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
-the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
+for the Debian project.
diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7
index 98507cc01..b0843b4d9 100644
--- a/manpages/de/live-build.de.7
+++ b/manpages/de/live-build.de.7
@@ -282,5 +282,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
-the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
+for the Debian project.
diff --git a/manpages/en/lb.1 b/manpages/en/lb.1
index 2e810614e..bafc51b3d 100644
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -31,4 +31,4 @@ More information about live\-build and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-build package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1
index e9bc269ab..2918e37fd 100644
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -29,4 +29,4 @@ More information about live\-build and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-build package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1
index e66d0cec8..dc8719a6b 100644
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -29,4 +29,4 @@ More information about live\-build and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-build package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1
index 06a03c089..62c205ea3 100644
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -31,4 +31,4 @@ More information about live\-build and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-build package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1
index b2d476eef..7917b27ac 100644
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -29,4 +29,4 @@ More information about live\-build and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-build package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1
index eea1edca6..f819ee74e 100644
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -52,4 +52,4 @@ More information about live\-build and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-build package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index f07effd5a..b43a500aa 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -494,4 +494,4 @@ More information about live\-build and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-build package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian\-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index 958a0ee2b..bd7bea0c4 100644
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -29,4 +29,4 @@ More information about live\-build and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-build package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1
index 7fac9e43d..7b5e42b8f 100644
--- a/manpages/en/lb_testroot.1
+++ b/manpages/en/lb_testroot.1
@@ -31,4 +31,4 @@ More information about live\-build and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-build package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index 3057443b2..6b891e4b2 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -230,4 +230,4 @@ More information about live\-build and the Debian Live project can be found on t
 Bugs can be reported by submitting a bugreport for the live\-build package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.
 
 .SH AUTHOR
-live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project.
+live\-build was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR> for the Debian project.
diff --git a/manpages/po/de/lb.1.po b/manpages/po/de/lb.1.po
index 01826ec7b..75b1e085c 100644
--- a/manpages/po/de/lb.1.po
+++ b/manpages/po/de/lb.1.po
@@ -1,13 +1,13 @@
 # German translations for live-build
-# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 # This file is distributed under the same license as the live-build package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a14-1\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
+"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -196,6 +196,6 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po
index 295d8f7e2..f9392ebab 100644
--- a/manpages/po/de/lb_binary.1.po
+++ b/manpages/po/de/lb_binary.1.po
@@ -1,13 +1,13 @@
 # German translations for live-build
-# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 # This file is distributed under the same license as the live-build package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a14-1\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
+"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -166,8 +166,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po
index acd033bfd..785f10fb6 100644
--- a/manpages/po/de/lb_bootstrap.1.po
+++ b/manpages/po/de/lb_bootstrap.1.po
@@ -1,13 +1,13 @@
 # German translations for live-build
-# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 # This file is distributed under the same license as the live-build package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a14-1\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
+"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -166,8 +166,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po
index 154c2bd63..5231ccbb5 100644
--- a/manpages/po/de/lb_build.1.po
+++ b/manpages/po/de/lb_build.1.po
@@ -1,13 +1,13 @@
 # German translations for live-build
-# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 # This file is distributed under the same license as the live-build package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a14-1\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
+"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -159,8 +159,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po
index f63b6eabc..fe87a6d01 100644
--- a/manpages/po/de/lb_chroot.1.po
+++ b/manpages/po/de/lb_chroot.1.po
@@ -1,13 +1,13 @@
 # German translations for live-build
-# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 # This file is distributed under the same license as the live-build package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a14-1\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
+"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -166,8 +166,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po
index bee5c84a4..066189f93 100644
--- a/manpages/po/de/lb_clean.1.po
+++ b/manpages/po/de/lb_clean.1.po
@@ -1,13 +1,13 @@
 # German translations for live-build
-# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 # This file is distributed under the same license as the live-build package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a14-1\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
+"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -159,8 +159,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index b299ee5de..6d098ea5e 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -1,13 +1,13 @@
 # German translations for live-build
-# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 # This file is distributed under the same license as the live-build package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a14-1\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
+"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -159,8 +159,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po
index fb1d4d6c7..de0cd82f5 100644
--- a/manpages/po/de/lb_source.1.po
+++ b/manpages/po/de/lb_source.1.po
@@ -1,13 +1,13 @@
 # German translations for live-build
-# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 # This file is distributed under the same license as the live-build package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a14-1\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
+"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -166,8 +166,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po
index 484a8a42e..cfa8bdf8a 100644
--- a/manpages/po/de/lb_testroot.1.po
+++ b/manpages/po/de/lb_testroot.1.po
@@ -1,13 +1,13 @@
 # German translations for live-build
-# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 # This file is distributed under the same license as the live-build package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a14-1\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
+"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -166,8 +166,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index 83817ae01..1a12d2610 100644
--- a/manpages/po/de/live-build.7.po
+++ b/manpages/po/de/live-build.7.po
@@ -1,13 +1,13 @@
 # German translations for live-build
-# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+# Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 # This file is distributed under the same license as the live-build package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a14-1\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
+"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -152,8 +152,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: IP
diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot
index fa898e403..a4d9788b0 100644
--- a/manpages/pot/lb.1.pot
+++ b/manpages/pot/lb.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -197,6 +197,6 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot
index c1c04bd8c..ae8e87c8a 100644
--- a/manpages/pot/lb_binary.1.pot
+++ b/manpages/pot/lb_binary.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -167,8 +167,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot
index 6fc448011..5dfa41428 100644
--- a/manpages/pot/lb_bootstrap.1.pot
+++ b/manpages/pot/lb_bootstrap.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -167,8 +167,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot
index d2e981293..4754ce6d2 100644
--- a/manpages/pot/lb_build.1.pot
+++ b/manpages/pot/lb_build.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -160,8 +160,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot
index af3966139..3e2a2748a 100644
--- a/manpages/pot/lb_chroot.1.pot
+++ b/manpages/pot/lb_chroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -167,8 +167,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot
index 359f94fc5..bacb347ff 100644
--- a/manpages/pot/lb_clean.1.pot
+++ b/manpages/pot/lb_clean.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -160,8 +160,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 6128c6e0f..59a5437ae 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -160,8 +160,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot
index fa802e402..0f2bd5551 100644
--- a/manpages/pot/lb_source.1.pot
+++ b/manpages/pot/lb_source.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -167,8 +167,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot
index 17a0d2141..f3fb3398c 100644
--- a/manpages/pot/lb_testroot.1.pot
+++ b/manpages/pot/lb_testroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -167,8 +167,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: Plain text
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 20be1126d..7c7bd6ef8 100644
--- a/manpages/pot/live-build.7.pot
+++ b/manpages/pot/live-build.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-10 19:07+0100\n"
+"POT-Creation-Date: 2013-03-10 19:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -153,8 +153,8 @@ msgstr ""
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
 #: en/lb_testroot.1:34 en/live-build.7:233
 msgid ""
-"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
-"the Debian project."
+"live-build was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt> "
+"for the Debian project."
 msgstr ""
 
 #. type: IP
diff --git a/scripts/build.sh b/scripts/build.sh
index 78d3d1a68..a6e044c9f 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## 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
diff --git a/scripts/build/binary b/scripts/build/binary
index 52125766d..4bc1e0f8f 100755
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums
index cbc29f0cc..d2884f724 100755
--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_chroot b/scripts/build/binary_chroot
index 947e55b65..c4b67b51b 100755
--- a/scripts/build/binary_chroot
+++ b/scripts/build/binary_chroot
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index 39385c3da..ccd6b5c8f 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index b3cd11193..38e833035 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
index b4f81666f..1dcae2580 100755
--- a/scripts/build/binary_grub
+++ b/scripts/build/binary_grub
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
index 946387d56..be8ef7fbc 100755
--- a/scripts/build/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index 972058aa5..c5fdf70df 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_hooks b/scripts/build/binary_hooks
index c3ff6bafb..6c99cbe17 100755
--- a/scripts/build/binary_hooks
+++ b/scripts/build/binary_hooks
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes
index 5da42c9dc..e9c57b141 100755
--- a/scripts/build/binary_includes
+++ b/scripts/build/binary_includes
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index 10755ebe1..bf5e47ee4 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
index c475444ec..f061ae3b5 100755
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin
index b6f261aa6..5648a51f8 100755
--- a/scripts/build/binary_loadlin
+++ b/scripts/build/binary_loadlin
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest
index 91e3646ef..1d322bebe 100755
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index 5fb2ba007..db50ab304 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot
index 30f1bea04..87723c79a 100755
--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index b08fb178d..dd7209919 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 10d77c55e..76ec52dae 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 26d905ff4..0504b5f35 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar
index efe567e31..23a8a76b6 100755
--- a/scripts/build/binary_tar
+++ b/scripts/build/binary_tar
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 36ee6128a..135884968 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync
index 5a13a3ee6..d3c1e2a92 100755
--- a/scripts/build/binary_zsync
+++ b/scripts/build/binary_zsync
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap
index f7c58dda8..468e200d9 100755
--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/bootstrap_archive-keys b/scripts/build/bootstrap_archive-keys
index 2dc94b28f..4f02f5365 100755
--- a/scripts/build/bootstrap_archive-keys
+++ b/scripts/build/bootstrap_archive-keys
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/bootstrap_cache b/scripts/build/bootstrap_cache
index 30e876d22..794384eb3 100755
--- a/scripts/build/bootstrap_cache
+++ b/scripts/build/bootstrap_cache
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap
index ee0f05bb1..9be2ab382 100755
--- a/scripts/build/bootstrap_cdebootstrap
+++ b/scripts/build/bootstrap_cdebootstrap
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index cef2f23df..528184a22 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/build b/scripts/build/build
index bc86b62e0..7b70f35ce 100755
--- a/scripts/build/build
+++ b/scripts/build/build
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot b/scripts/build/chroot
index aa3b11e52..f15068f30 100755
--- a/scripts/build/chroot
+++ b/scripts/build/chroot
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt
index 1ba697e99..9c4dedb4f 100755
--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index b0d86a2b1..717243f09 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_cache b/scripts/build/chroot_cache
index 98d5a6de3..0bb8444fd 100755
--- a/scripts/build/chroot_cache
+++ b/scripts/build/chroot_cache
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_debianchroot b/scripts/build/chroot_debianchroot
index d2a6599e9..bca96a81e 100755
--- a/scripts/build/chroot_debianchroot
+++ b/scripts/build/chroot_debianchroot
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts
index 6075544c1..a8416c611 100755
--- a/scripts/build/chroot_devpts
+++ b/scripts/build/chroot_devpts
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg
index c67d8eb96..b199cdf17 100755
--- a/scripts/build/chroot_dpkg
+++ b/scripts/build/chroot_dpkg
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware
index 60c52668a..ca3eb5c25 100755
--- a/scripts/build/chroot_firmware
+++ b/scripts/build/chroot_firmware
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index bbf02f930..b842c0e4c 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_hooks b/scripts/build/chroot_hooks
index dc9c18c69..66cdedcf4 100755
--- a/scripts/build/chroot_hooks
+++ b/scripts/build/chroot_hooks
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_hostname b/scripts/build/chroot_hostname
index 432d60e7f..edc38a151 100755
--- a/scripts/build/chroot_hostname
+++ b/scripts/build/chroot_hostname
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_hosts b/scripts/build/chroot_hosts
index 6e44cf8f2..399d11017 100755
--- a/scripts/build/chroot_hosts
+++ b/scripts/build/chroot_hosts
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_includes b/scripts/build/chroot_includes
index ccd12b36c..c0dd75d6f 100755
--- a/scripts/build/chroot_includes
+++ b/scripts/build/chroot_includes
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_install-packages b/scripts/build/chroot_install-packages
index 2e02706c7..e955621e9 100755
--- a/scripts/build/chroot_install-packages
+++ b/scripts/build/chroot_install-packages
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_interactive b/scripts/build/chroot_interactive
index 422ac50cd..01ac29037 100755
--- a/scripts/build/chroot_interactive
+++ b/scripts/build/chroot_interactive
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index a352cbeb5..deb565b0d 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_live-packages b/scripts/build/chroot_live-packages
index dff811673..df5653f07 100755
--- a/scripts/build/chroot_live-packages
+++ b/scripts/build/chroot_live-packages
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists
index c06c116f3..f6daee609 100755
--- a/scripts/build/chroot_package-lists
+++ b/scripts/build/chroot_package-lists
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed
index 77e94c9c2..9eb986ed9 100755
--- a/scripts/build/chroot_preseed
+++ b/scripts/build/chroot_preseed
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc
index ba564e3fb..87e968c26 100755
--- a/scripts/build/chroot_proc
+++ b/scripts/build/chroot_proc
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv
index 5d4f78005..d53063b01 100755
--- a/scripts/build/chroot_resolv
+++ b/scripts/build/chroot_resolv
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs
index 55b3e0ce1..567cb27b2 100755
--- a/scripts/build/chroot_selinuxfs
+++ b/scripts/build/chroot_selinuxfs
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_sysfs b/scripts/build/chroot_sysfs
index 4dab358db..af2e53f26 100755
--- a/scripts/build/chroot_sysfs
+++ b/scripts/build/chroot_sysfs
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_sysv-rc b/scripts/build/chroot_sysv-rc
index ed78bdbcf..247290e61 100755
--- a/scripts/build/chroot_sysv-rc
+++ b/scripts/build/chroot_sysv-rc
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_tmpfs b/scripts/build/chroot_tmpfs
index 009f8c9fb..45ca41bf4 100755
--- a/scripts/build/chroot_tmpfs
+++ b/scripts/build/chroot_tmpfs
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/chroot_upstart b/scripts/build/chroot_upstart
index 1ab64f468..47d68c2d3 100755
--- a/scripts/build/chroot_upstart
+++ b/scripts/build/chroot_upstart
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/clean b/scripts/build/clean
index 8706bf214..771e2cd6a 100755
--- a/scripts/build/clean
+++ b/scripts/build/clean
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/config b/scripts/build/config
index b70f9ca2f..551c959d4 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/source b/scripts/build/source
index 4296c2750..9866312d1 100755
--- a/scripts/build/source
+++ b/scripts/build/source
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums
index cd47fd005..96e10e5ea 100755
--- a/scripts/build/source_checksums
+++ b/scripts/build/source_checksums
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index b7ba06b42..bc2b5ef44 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/source_debian-live b/scripts/build/source_debian-live
index d71b69f04..90c9216a8 100755
--- a/scripts/build/source_debian-live
+++ b/scripts/build/source_debian-live
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
index 2cd868e4a..1cfce9b1e 100755
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd
index 1b5ee9121..77b27f860 100755
--- a/scripts/build/source_hdd
+++ b/scripts/build/source_hdd
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/source_hooks b/scripts/build/source_hooks
index f3316bd97..3f3ef1939 100755
--- a/scripts/build/source_hooks
+++ b/scripts/build/source_hooks
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/source_iso b/scripts/build/source_iso
index 8b6beac81..dd6212326 100755
--- a/scripts/build/source_iso
+++ b/scripts/build/source_iso
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/source_tar b/scripts/build/source_tar
index da58938cf..9113f22a9 100755
--- a/scripts/build/source_tar
+++ b/scripts/build/source_tar
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/scripts/build/testroot b/scripts/build/testroot
index 9b4f86c26..97d87674f 100755
--- a/scripts/build/testroot
+++ b/scripts/build/testroot
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
diff --git a/share/bin/Packages b/share/bin/Packages
index 83c7e9352..920750c5a 100755
--- a/share/bin/Packages
+++ b/share/bin/Packages
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it