25 files changed, 32 insertions, 26 deletions
diff --git a/lists/debian-forensics b/lists/debian-forensics
index 18b6d2fd5..834004cb1 100644
--- a/lists/debian-forensics
+++ b/lists/debian-forensics
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/debian-forensics - package list for live-helper(7)
+# /usr/share/live/build/lists/debian-forensics - package list for live-build(7)
 
 ## LH: Debian Forensics
 #include <standard>
diff --git a/lists/debian-junior b/lists/debian-junior
index 7c84e2d3f..b5bf5d74b 100644
--- a/lists/debian-junior
+++ b/lists/debian-junior
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/debian-junior - package list for live-helper(7)
+# /usr/share/live/build/lists/debian-junior - package list for live-build(7)
 
 ## LH: Debian Junior
 #include <standard>
diff --git a/lists/debian-live b/lists/debian-live
index c3d89af68..5f4f05dc5 100644
--- a/lists/debian-live
+++ b/lists/debian-live
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/debian-live - package list for live-helper(7)
+# /usr/share/live/build/lists/debian-live - package list for live-build(7)
 
 ## LH: Debian Live
 #include <standard>
@@ -6,7 +6,13 @@
 # http://qa.debian.org/developer.php?login=debian-live@lists.debian.org
 
 # debian-live
-live-helper git-core
+#if DISTRIBUTION lenny
+live-helper
+#endif
+#if DISTRIBUTION squeeze sid
+live-build
+#endif
+git-core
 debootstrap cdebootstrap
 dosfstools genisoimage memtest86+ memtest86 mtools parted squashfs-tools genext2fs mtd-tools sudo fakeroot syslinux grub
 
diff --git a/lists/debian-science b/lists/debian-science
index 369708b8b..d9da39d60 100644
--- a/lists/debian-science
+++ b/lists/debian-science
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/debian-science - package list for live-helper(7)
+# /usr/share/live/build/lists/debian-science - package list for live-build(7)
 
 ## LH: Debian Science
 #include <standard>
diff --git a/lists/gnome b/lists/gnome
index 834f0b07d..d003a38ed 100644
--- a/lists/gnome
+++ b/lists/gnome
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/gnome - package list for live-helper(7)
+# /usr/share/live/build/lists/gnome - package list for live-build(7)
 
 ## LH: GNOME Desktop
 #include <gnome-core>
diff --git a/lists/gnome-core b/lists/gnome-core
index bb97e309a..729f935ec 100644
--- a/lists/gnome-core
+++ b/lists/gnome-core
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/gnome-core - package list for live-helper(7)
+# /usr/share/live/build/lists/gnome-core - package list for live-build(7)
 
 ## LH: GNOME Core
 #include <standard-x11>
diff --git a/lists/gnome-full b/lists/gnome-full
index bc07f1d73..a1f9f9873 100644
--- a/lists/gnome-full
+++ b/lists/gnome-full
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/gnome-full - package list for live-helper(7)
+# /usr/share/live/build/lists/gnome-full - package list for live-build(7)
 
 ## LH: GNOME full
 #include <gnome>
diff --git a/lists/gnome-junior b/lists/gnome-junior
index 5a23cfc94..f5d4ef994 100644
--- a/lists/gnome-junior
+++ b/lists/gnome-junior
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/gnome-junior - package list for live-helper(7)
+# /usr/share/live/build/lists/gnome-junior - package list for live-build(7)
 
 ## LH: Debian Junior (Gnome)
 #include <gnome>
diff --git a/lists/gnustep b/lists/gnustep
index 7e5934f23..3fc0ad5aa 100644
--- a/lists/gnustep
+++ b/lists/gnustep
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/gnustep - package list for live-helper(7)
+# /usr/share/live/build/lists/gnustep - package list for live-build(7)
 
 ## LH: GNUstep desktop
 #include <standard-x11>
diff --git a/lists/kde b/lists/kde
index fb5d35bb3..72d3fa639 100644
--- a/lists/kde
+++ b/lists/kde
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/kde - package list for live-helper(7)
+# /usr/share/live/build/lists/kde - package list for live-build(7)
 
 ## LH: KDE
 #include <kde-core>
diff --git a/lists/kde-core b/lists/kde-core
index 6c7b373c5..57dc98620 100644
--- a/lists/kde-core
+++ b/lists/kde-core
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/kde-core - package list for live-helper(7)
+# /usr/share/live/build/lists/kde-core - package list for live-build(7)
 
 ## LH: KDE Core
 #include <standard-x11>
diff --git a/lists/kde-extra b/lists/kde-extra
index fe74cf408..a64d1db68 100644
--- a/lists/kde-extra
+++ b/lists/kde-extra
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/kde-extra - package list for live-helper(7)
+# /usr/share/live/build/lists/kde-extra - package list for live-build(7)
 
 ## LH: KDE Extra
 #include <kde-full>
diff --git a/lists/kde-full b/lists/kde-full
index e416ce75a..60f1f07c0 100644
--- a/lists/kde-full
+++ b/lists/kde-full
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/kde-full - package list for live-helper(7)
+# /usr/share/live/build/lists/kde-full - package list for live-build(7)
 
 ## LH: KDE Full
 #include <kde>
diff --git a/lists/kde-junior b/lists/kde-junior
index 3a0edd760..0f79744c7 100644
--- a/lists/kde-junior
+++ b/lists/kde-junior
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/kde-junior - package list for live-helper(7)
+# /usr/share/live/build/lists/kde-junior - package list for live-build(7)
 
 ## LH: KDE Junior
 #include <kde>
diff --git a/lists/lxde b/lists/lxde
index 1bd69d481..26bffd3b0 100644
--- a/lists/lxde
+++ b/lists/lxde
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/lxde - package list for live-helper(7)
+# /usr/share/live/build/lists/lxde - package list for live-build(7)
 
 ## LH: LXDE
 #include <standard-x11>
diff --git a/lists/minimal b/lists/minimal
index 991332bc2..08f56c7fc 100644
--- a/lists/minimal
+++ b/lists/minimal
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/minimal - package list for live-helper(7)
+# /usr/share/live/build/lists/minimal - package list for live-build(7)
 
 ## LH: Minimal
 
diff --git a/lists/rescue b/lists/rescue
index 80b838e49..9ee910c63 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/rescue - package list for live-helper(7)
+# /usr/share/live/build/lists/rescue - package list for live-build(7)
 
 ## LH: Rescue
 #include <standard>
diff --git a/lists/standard b/lists/standard
index 60de1cd72..95a551c5f 100644
--- a/lists/standard
+++ b/lists/standard
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/standard - package list for live-helper(7)
+# /usr/share/live/build/lists/standard - package list for live-build(7)
 
 ## LH: Standard
 #include <minimal>
diff --git a/lists/standard-x11 b/lists/standard-x11
index f01674717..1c2493472 100644
--- a/lists/standard-x11
+++ b/lists/standard-x11
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/standard-x11 - package list for live-helper(7)
+# /usr/share/live/build/lists/standard-x11 - package list for live-build(7)
 
 ## LH: Standard X11
 #include <standard>
diff --git a/lists/studio b/lists/studio
index 2fdebd4ca..f7e4e5fad 100644
--- a/lists/studio
+++ b/lists/studio
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/studio - package list for live-helper(7)
+# /usr/share/live/build/lists/studio - package list for live-build(7)
 
 ## LH: Music Studio base
 # packagelist inspired from the A/DeMuDi one.
diff --git a/lists/studio-gnome b/lists/studio-gnome
index c722ae6c7..0dc76b1e0 100644
--- a/lists/studio-gnome
+++ b/lists/studio-gnome
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/studio-gnome - package list for live-helper(7)
+# /usr/share/live/build/lists/studio-gnome - package list for live-build(7)
 
 ## LH: Music Studio (Gnome)
 #include <gnome>
diff --git a/lists/studio-kde b/lists/studio-kde
index 5d651480c..537407643 100644
--- a/lists/studio-kde
+++ b/lists/studio-kde
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/studio-kde - package list for live-helper(7)
+# /usr/share/live/build/lists/studio-kde - package list for live-build(7)
 
 ## LH: Music Studio (KDE)
 #include <kde>
diff --git a/lists/studio-xfce b/lists/studio-xfce
index 635130158..c6005fb2c 100644
--- a/lists/studio-xfce
+++ b/lists/studio-xfce
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/studio-xfce - package list for live-helper(7)
+# /usr/share/live/build/lists/studio-xfce - package list for live-build(7)
 
 ## LH: Music Studio (Xfce)
 #include <xfce>
diff --git a/lists/xfce b/lists/xfce
index b8df70624..c554be860 100644
--- a/lists/xfce
+++ b/lists/xfce
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/xfce - package list for live-helper(7)
+# /usr/share/live/build/lists/xfce - package list for live-build(7)
 
 ## LH: Xfce
 #include <standard-x11>
diff --git a/lists/xfce-junior b/lists/xfce-junior
index 0bfa094a4..e2bf43a55 100644
--- a/lists/xfce-junior
+++ b/lists/xfce-junior
@@ -1,4 +1,4 @@
-# /usr/share/live/build/lists/xfce-junior - package list for live-helper(7)
+# /usr/share/live/build/lists/xfce-junior - package list for live-build(7)
 
 ## LH: Xfce Debian Junior
 #include <xfce>