diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index e4684baf..16323f9a 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -671,14 +671,24 @@
     </packagelist>
   </group>
   <group>
-    <id>cinnamon</id>
-    <_name>Cinnamon</_name>
-    <_description>Cinnamon Desktop</_description>
+    <id>cinnamon-desktop</id>
+    <_name>Cinnamon Desktop</_name>
+    <_description>Cinnamon provides a deskop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>cinnamon</packagereq>
+      <packagereq>eog</packagereq>
+      <packagereq>evince</packagereq>
+      <packagereq>firstboot</packagereq>
       <packagereq>firefox</packagereq>
+      <packagereq>gcalctool</packagereq>
+      <packagereq>gdm</packagereq>
+      <packagereq>gedit</packagereq>
+      <packagereq>gnome-icon-theme</packagereq>
+      <packagereq>gnome-screensaver</packagereq>
+      <packagereq>gnome-system-monitor</packagereq>
+      <packagereq>gnome-terminal</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5881,6 +5891,27 @@
       <groupid>lxde-office</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>cinnamon-desktop</id>
+    <_name>Cinnamon Desktop</_name>
+    <_description>.</_description>
+    <display_order>21</display_order>
+    <grouplist>
+      <groupid>base-x</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
+      <groupid>input-methods</groupid>
+      <groupid>multimedia</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>printing</groupid>
+      <groupid>cinnamon</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>libreoffice</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>mate-desktop</id>
     <_name>MATE Desktop</_name>
@@ -6036,7 +6067,6 @@
       <groupid>lightdm</groupid>
     </grouplist>
     <optionlist>
-      <groupid>cinnamon</groupid>
       <groupid>firefox</groupid>
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index c5d23848..4cdb4572 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -684,14 +684,24 @@
     </packagelist>
   </group>
   <group>
-    <id>cinnamon</id>
-    <_name>Cinnamon</_name>
-    <_description>Cinnamon Desktop</_description>
+    <id>cinnamon-desktop</id>
+    <_name>Cinnamon Desktop</_name>
+    <_description>Cinnamon provides a deskop with a traditional layout, advanced features, easy to use, powerful and flexible.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>cinnamon</packagereq>
+      <packagereq>eog</packagereq>
+      <packagereq>evince</packagereq>
+      <packagereq>firstboot</packagereq>
       <packagereq>firefox</packagereq>
+      <packagereq>gcalctool</packagereq>
+      <packagereq>gdm</packagereq>
+      <packagereq>gedit</packagereq>
+      <packagereq>gnome-icon-theme</packagereq>
+      <packagereq>gnome-screensaver</packagereq>
+      <packagereq>gnome-system-monitor</packagereq>
+      <packagereq>gnome-terminal</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5893,6 +5903,27 @@
       <groupid>lxde-office</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>cinnamon-desktop</id>
+    <_name>Cinnamon Desktop</_name>
+    <_description>.</_description>
+    <display_order>21</display_order>
+    <grouplist>
+      <groupid>base-x</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>dial-up</groupid>
+      <groupid>fonts</groupid>
+      <groupid>input-methods</groupid>
+      <groupid>multimedia</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>printing</groupid>
+      <groupid>cinnamon</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>libreoffice</groupid>
+    </optionlist>
+  </environment>
   <environment>
     <id>mate-desktop</id>
     <_name>MATE Desktop</_name>
@@ -6048,7 +6079,6 @@
       <groupid>lightdm</groupid>
     </grouplist>
     <optionlist>
-      <groupid>cinnamon</groupid>
       <groupid>firefox</groupid>
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>