diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 019080e3..49448442 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -657,18 +657,42 @@
     </packagelist>
   </group>
   <group>
-    <id>xmonad</id>
-    <_name>XMonad</_name>
-    <_description>A tiling window manager</_description>
+    <id>lightdm</id>
+    <_name>Lightdm</_name>
+    <_description>Lightwight Display Manager</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
       <packagereq>adwaita-gtk3-theme</packagereq>
-      <packagereq>dmenu</packagereq>
       <packagereq>firstboot</packagereq>
       <packagereq>lightdm-gtk</packagereq>
+      <packagereq>redhat-menus</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>lxdm</id>
+    <_name>LXDM</_name>
+    <_description>Lightwight X Display Manager</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>adwaita-cursor-theme</packagereq>
+      <packagereq>adwaita-gtk2-theme</packagereq>
+      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>firstboot</packagereq>
+      <packagereq>lightdm-gtk</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>xmonad</id>
+    <_name>XMonad</_name>
+    <_description>A tiling window manager</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>dmenu</packagereq>
       <packagereq>xmonad-basic</packagereq>
     </packagelist>
   </group>
@@ -5942,6 +5966,8 @@
       <groupid>firefox</groupid>
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
+      <groupid>lightdm</groupid>
+      <groupid>lxdm</groupid>
       <groupid>xmonad</groupid>
     </optionlist>
   </environment>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index c3d1431f..6a68cff1 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -657,18 +657,42 @@
     </packagelist>
   </group>
   <group>
-    <id>xmonad</id>
-    <_name>XMonad</_name>
-    <_description>A tiling window manager</_description>
+    <id>lightdm</id>
+    <_name>Lightdm</_name>
+    <_description>Lightwight Display Manager</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>adwaita-cursor-theme</packagereq>
       <packagereq>adwaita-gtk2-theme</packagereq>
       <packagereq>adwaita-gtk3-theme</packagereq>
-      <packagereq>dmenu</packagereq>
       <packagereq>firstboot</packagereq>
       <packagereq>lightdm-gtk</packagereq>
+      <packagereq>redhat-menus</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>lxdm</id>
+    <_name>LXDM</_name>
+    <_description>Lightwight X Display Manager</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>adwaita-cursor-theme</packagereq>
+      <packagereq>adwaita-gtk2-theme</packagereq>
+      <packagereq>adwaita-gtk3-theme</packagereq>
+      <packagereq>firstboot</packagereq>
+      <packagereq>lightdm-gtk</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>xmonad</id>
+    <_name>XMonad</_name>
+    <_description>A tiling window manager</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>dmenu</packagereq>
       <packagereq>xmonad-basic</packagereq>
     </packagelist>
   </group>
@@ -5942,6 +5966,8 @@
       <groupid>firefox</groupid>
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
+      <groupid>lightdm</groupid>
+      <groupid>lxdm</groupid>
       <groupid>xmonad</groupid>
     </optionlist>
   </environment>