diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 56dd9529..e4684baf 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -692,6 +692,18 @@
       <packagereq>xmonad-basic</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>xmonad-gnome</id>
+    <_name>XMonad for GNOME</_name>
+    <_description>XMonad window manager with GNOME</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>control-center</packagereq>
+      <packagereq>gnome-panel</packagereq>
+      <packagereq>xmonad-gnome</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>haproxy</id>
     <_name>HAProxy</_name>
@@ -6029,6 +6041,7 @@
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>xmonad</groupid>
+      <groupid>xmonad-gnome</groupid>
     </optionlist>
   </environment>
   <environment>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 894f78fe..c5d23848 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -705,6 +705,18 @@
       <packagereq>xmonad-basic</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>xmonad-gnome</id>
+    <_name>XMonad for GNOME</_name>
+    <_description>XMonad window manager with GNOME</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>control-center</packagereq>
+      <packagereq>gnome-panel</packagereq>
+      <packagereq>xmonad-gnome</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>haproxy</id>
     <_name>HAProxy</_name>
@@ -6041,6 +6053,7 @@
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
       <groupid>xmonad</groupid>
+      <groupid>xmonad-gnome</groupid>
     </optionlist>
   </environment>
   <environment>