diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index df8ab121..6995dc41 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -648,6 +648,17 @@
       <packagereq>sugar-xomail</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>xmonad</id>
+    <_name>XMonad</_name>
+    <_description>A tiling window manager</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>xmonad</packagereq>
+      <packagereq>dmenu</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>haproxy</id>
     <_name>HAProxy</_name>
@@ -5961,7 +5972,6 @@
       <packagereq type="optional">WindowMaker</packagereq>
       <packagereq type="optional">wmx</packagereq>
       <packagereq type="optional">xcompmgr</packagereq>
-      <packagereq type="optional">xmonad</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6384,6 +6394,7 @@
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>multimedia</groupid>
+      <groupid>xmonad</groupid>
     </optionlist>
   </environment>
   <environment>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 4073613d..f8ab8a75 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -648,6 +648,17 @@
       <packagereq>sugar-xomail</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>xmonad</id>
+    <_name>XMonad</_name>
+    <_description>A tiling window manager</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>xmonad</packagereq>
+      <packagereq>dmenu</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>haproxy</id>
     <_name>HAProxy</_name>
@@ -5942,7 +5953,6 @@
       <packagereq type="optional">WindowMaker</packagereq>
       <packagereq type="optional">wmx</packagereq>
       <packagereq type="optional">xcompmgr</packagereq>
-      <packagereq type="optional">xmonad</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6365,6 +6375,7 @@
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>multimedia</groupid>
+      <groupid>xmonad</groupid>
     </optionlist>
   </environment>
   <environment>