diff --git a/lists/gnome-core b/lists/gnome-core
index 1707135ee..34c74a289 100644
--- a/lists/gnome-core
+++ b/lists/gnome-core
@@ -4,5 +4,11 @@
 #include <standard-x11>
 
 gnome-core
-gdm desktop-base
+#if DISTRIBUTION lenny
+gdm
+#endif
+#if DISTRIBUTION squeeze sid
+gdm3
+#endif
+desktop-base
 gnome-themes
diff --git a/lists/gnome-full b/lists/gnome-full
index 46f2092bd..630299c3f 100644
--- a/lists/gnome-full
+++ b/lists/gnome-full
@@ -4,4 +4,10 @@
 #include <gnome>
 
 gnome
-gdm desktop-base
+#if DISTRIBUTION lenny
+gdm
+#endif
+#if DISTRIBUTION squeeze sid
+gdm3
+#endif
+desktop-base
diff --git a/lists/lxde b/lists/lxde
index 5d1537e5e..677797975 100644
--- a/lists/lxde
+++ b/lists/lxde
@@ -5,9 +5,11 @@
 
 lxde
 #if DISTRIBUTION lenny
+gdm
 lxnm
 #endif
 #if DISTRIBUTION squeeze sid
+gdm3
 wicd
 #endif
-gdm desktop-base
+desktop-base
diff --git a/lists/xfce b/lists/xfce
index b63935d7d..4d7db258d 100644
--- a/lists/xfce
+++ b/lists/xfce
@@ -4,4 +4,10 @@
 #include <standard-x11>
 
 xfce4
-gdm desktop-base
+#if DISTRIBUTION lenny
+gdm
+#endif
+#if DISTRIBUTION squeeze sid
+gdm3
+#endif
+desktop-base