8 files changed, 34 insertions, 18 deletions
diff --git a/lists/debian-forensics b/lists/debian-forensics
new file mode 100644
index 000000000..19cb4f847
--- /dev/null
+++ b/lists/debian-forensics
@@ -0,0 +1,17 @@
+# /usr/share/live-helper/lists/debian-forensics - package list for live-helper(7)
+
+## LH: Debian Forensics
+#include <standard>
+
+# http://qa.debian.org/developer.php?login=forensics-devel@lists.alioth.debian.org
+
+gpart tct wipe
+
+#if DISTRIBUTION lenny sid
+ext3grep galleta grokevt memdump missidentify myrescue pasco reglookup
+scrounge-ntfs ssdeep tableau-parm
+#endif
+
+#if DISTRIBUTION sid
+libewf1 md5deep pipebench recoverdm rifiuti
+#endif
diff --git a/lists/junior-pkgs b/lists/debian-junior
index aced54385..51b5b34f1 100644
--- a/lists/junior-pkgs
+++ b/lists/debian-junior
@@ -1,6 +1,9 @@
-# /usr/share/live-helper/lists/junior-pkgs - package list for live-helper(7)
+# /usr/share/live-helper/lists/debian-junior - package list for live-helper(7)
 
-## LH: Desktop agnostic packages for Debian Junior
+## LH: Debian Junior
+#include <standard>
+
+# http://qa.debian.org/developer.php?login=debian-jr@lists.debian.org
 
 junior-sound junior-typing junior-internet junior-toys junior-games-net
 junior-games-sim junior-games-gl junior-puzzle junior-arcade junior-math
diff --git a/lists/devel-live b/lists/debian-live
index 57faf0d8e..208a30370 100644
--- a/lists/devel-live
+++ b/lists/debian-live
@@ -1,8 +1,10 @@
-# /usr/share/live-helper/lists/devel-live - package list for live-helper(7)
+# /usr/share/live-helper/lists/debian-live - package list for live-helper(7)
 
-## LH: Development (Debian Live)
+## LH: Debian Live
 #include <standard>
 
+# http://qa.debian.org/developer.php?login=debian-live@lists.debian.org
+
 # debian-live
 live-helper git-core
 debootstrap cdebootstrap
diff --git a/lists/science b/lists/debian-science
index 52c25da7a..3d7a2b25a 100644
--- a/lists/science
+++ b/lists/debian-science
@@ -1,8 +1,10 @@
-# /usr/share/live-helper/lists/science - package list for live-helper(7)
+# /usr/share/live-helper/lists/debian-science - package list for live-helper(7)
 
 ## LH: Debian Science
 #include <standard>
 
+# http://qa.debian.org/developer.php?login=debian-science-maintainers@lists.alioth.debian.org
+
 science-astronomy science-biology science-chemistry
 science-electronics science-engineering science-geography
 science-linguistics science-mathematics science-mathematics-dev
diff --git a/lists/gnome-junior b/lists/gnome-junior
index 25979491d..926f0e93a 100644
--- a/lists/gnome-junior
+++ b/lists/gnome-junior
@@ -2,6 +2,6 @@
 
 ## LH: Debian Junior (Gnome)
 #include <gnome>
-#include <junior-pkgs>
+#include <debian-junior>
 
-junior-gnome 
+junior-gnome
diff --git a/lists/kde-junior b/lists/kde-junior
index 9284a427e..136672290 100644
--- a/lists/kde-junior
+++ b/lists/kde-junior
@@ -2,6 +2,6 @@
 
 ## LH: KDE Junior
 #include <kde>
-#include <junior-pkgs>
+#include <debian-junior>
 
 junior-kde
diff --git a/lists/rescue b/lists/rescue
index f4bf89a38..0090ce2c3 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -4,15 +4,7 @@
 #include <standard>
 
 # Debian Forensics
-# http://qa.debian.org/developer.php?login=forensics-devel@lists.alioth.debian.org
-gpart tct wipe
-#if DISTRIBUTION lenny sid
-ext3grep galleta grokevt memdump missidentify myrescue pasco reglookup
-scrounge-ntfs ssdeep tableau-parm
-#endif
-#if DISTRIBUTION sid
-libewf1 md5deep pipebench recoverdm rifiuti
-#endif
+#include <debian-forensics>
 
 # Other forensic packages
 #if DISTRIBUTION lenny sid
diff --git a/lists/xfce-junior b/lists/xfce-junior
index ca71ec519..170c3292d 100644
--- a/lists/xfce-junior
+++ b/lists/xfce-junior
@@ -2,6 +2,6 @@
 
 ## LH: Xfce Debian Junior
 #include <xfce>
-#include <junior-pkgs>
+#include <debian-junior>
 
 junior-kde junior-gnome