diff --git a/comps-f7.xml.in b/comps-f7.xml.in
index 2b3fc4a3..d8eb8c76 100644
--- a/comps-f7.xml.in
+++ b/comps-f7.xml.in
@@ -8,6 +8,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">cacti</packagereq>
       <packagereq type="optional">galternatives</packagereq>
       <packagereq type="optional">gparted</packagereq>
       <packagereq type="optional">gsynaptics</packagereq>
@@ -137,6 +138,7 @@
       <packagereq type="optional">asa</packagereq>
       <packagereq type="optional">bazaar</packagereq>
       <packagereq type="optional">bigloo</packagereq>
+      <packagereq type="optional">bugzilla</packagereq>
       <packagereq type="optional">bzr</packagereq>
       <packagereq type="optional">ccache</packagereq>
       <packagereq type="optional">clips</packagereq>
@@ -303,6 +305,7 @@
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
       <packagereq type="optional">galculator</packagereq>
+      <packagereq type="optional">gchempaint</packagereq>
       <packagereq type="optional">gdl</packagereq>
       <packagereq type="optional">geant321</packagereq>
       <packagereq type="optional">geda-docs</packagereq>
@@ -533,6 +536,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">xdg-user-dirs-gtk</packagereq>
+      <packagereq type="optional">beryl-gnome</packagereq>
       <packagereq type="optional">buoh</packagereq>
       <packagereq type="optional">byzanz</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
@@ -620,6 +624,7 @@
       <packagereq type="optional">bittorrent-gui</packagereq>
       <packagereq type="optional">blogtk</packagereq>
       <packagereq type="optional">bluefish</packagereq>
+      <packagereq type="optional">claws-mail</packagereq>
       <packagereq type="optional">contact-lookup-applet</packagereq>
       <packagereq type="optional">d4x</packagereq>
       <packagereq type="optional">deluge</packagereq>
@@ -664,7 +669,6 @@
       <packagereq type="optional">screem</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
-      <packagereq type="optional">sylpheed-claws</packagereq>
       <packagereq type="optional">transmission</packagereq>
       <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">urlgfe</packagereq>
@@ -736,6 +740,7 @@
     <packagelist>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
+      <packagereq type="optional">bcm43xx-fwcutter</packagereq>
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
       <packagereq type="optional">hddtemp</packagereq>
@@ -786,6 +791,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">basket</packagereq>
+      <packagereq type="optional">beryl-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">dolphin</packagereq>
       <packagereq type="optional">gtk-qt-engine</packagereq>
@@ -888,6 +894,7 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">cobbler</packagereq>
       <packagereq type="optional">ctrlproxy</packagereq>
       <packagereq type="optional">dnsmasq</packagereq>
       <packagereq type="optional">ejabberd</packagereq>
@@ -998,6 +1005,7 @@
       <packagereq type="optional">alsamixergui</packagereq>
       <packagereq type="optional">amarok</packagereq>
       <packagereq type="optional">ardour</packagereq>
+      <packagereq type="optional">audacious</packagereq>
       <packagereq type="optional">audacity</packagereq>
       <packagereq type="optional">aumix</packagereq>
       <packagereq type="optional">banshee</packagereq>
@@ -1005,6 +1013,8 @@
       <packagereq type="optional">brasero</packagereq>
       <packagereq type="optional">camE</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>
+      <packagereq type="optional">cowbell</packagereq>
+      <packagereq type="optional">csound-gui</packagereq>
       <packagereq type="optional">Democracy</packagereq>
       <packagereq type="optional">dvdauthor</packagereq>
       <packagereq type="optional">dvdisaster</packagereq>
@@ -1059,6 +1069,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">BackupPC</packagereq>
+      <packagereq type="default">bonnie++</packagereq>
       <packagereq type="default">NetworkManager-openvpn</packagereq>
       <packagereq type="default">NetworkManager-vpnc</packagereq>
       <packagereq type="default">openvpn</packagereq>
diff --git a/comps-fe7.xml.in b/comps-fe7.xml.in
index 2b3fc4a3..d8eb8c76 100644
--- a/comps-fe7.xml.in
+++ b/comps-fe7.xml.in
@@ -8,6 +8,7 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">cacti</packagereq>
       <packagereq type="optional">galternatives</packagereq>
       <packagereq type="optional">gparted</packagereq>
       <packagereq type="optional">gsynaptics</packagereq>
@@ -137,6 +138,7 @@
       <packagereq type="optional">asa</packagereq>
       <packagereq type="optional">bazaar</packagereq>
       <packagereq type="optional">bigloo</packagereq>
+      <packagereq type="optional">bugzilla</packagereq>
       <packagereq type="optional">bzr</packagereq>
       <packagereq type="optional">ccache</packagereq>
       <packagereq type="optional">clips</packagereq>
@@ -303,6 +305,7 @@
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
       <packagereq type="optional">galculator</packagereq>
+      <packagereq type="optional">gchempaint</packagereq>
       <packagereq type="optional">gdl</packagereq>
       <packagereq type="optional">geant321</packagereq>
       <packagereq type="optional">geda-docs</packagereq>
@@ -533,6 +536,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">xdg-user-dirs-gtk</packagereq>
+      <packagereq type="optional">beryl-gnome</packagereq>
       <packagereq type="optional">buoh</packagereq>
       <packagereq type="optional">byzanz</packagereq>
       <packagereq type="optional">deskbar-applet</packagereq>
@@ -620,6 +624,7 @@
       <packagereq type="optional">bittorrent-gui</packagereq>
       <packagereq type="optional">blogtk</packagereq>
       <packagereq type="optional">bluefish</packagereq>
+      <packagereq type="optional">claws-mail</packagereq>
       <packagereq type="optional">contact-lookup-applet</packagereq>
       <packagereq type="optional">d4x</packagereq>
       <packagereq type="optional">deluge</packagereq>
@@ -664,7 +669,6 @@
       <packagereq type="optional">screem</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
-      <packagereq type="optional">sylpheed-claws</packagereq>
       <packagereq type="optional">transmission</packagereq>
       <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">urlgfe</packagereq>
@@ -736,6 +740,7 @@
     <packagelist>
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
+      <packagereq type="optional">bcm43xx-fwcutter</packagereq>
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
       <packagereq type="optional">hddtemp</packagereq>
@@ -786,6 +791,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">basket</packagereq>
+      <packagereq type="optional">beryl-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">dolphin</packagereq>
       <packagereq type="optional">gtk-qt-engine</packagereq>
@@ -888,6 +894,7 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="optional">cobbler</packagereq>
       <packagereq type="optional">ctrlproxy</packagereq>
       <packagereq type="optional">dnsmasq</packagereq>
       <packagereq type="optional">ejabberd</packagereq>
@@ -998,6 +1005,7 @@
       <packagereq type="optional">alsamixergui</packagereq>
       <packagereq type="optional">amarok</packagereq>
       <packagereq type="optional">ardour</packagereq>
+      <packagereq type="optional">audacious</packagereq>
       <packagereq type="optional">audacity</packagereq>
       <packagereq type="optional">aumix</packagereq>
       <packagereq type="optional">banshee</packagereq>
@@ -1005,6 +1013,8 @@
       <packagereq type="optional">brasero</packagereq>
       <packagereq type="optional">camE</packagereq>
       <packagereq type="optional">cdlabelgen</packagereq>
+      <packagereq type="optional">cowbell</packagereq>
+      <packagereq type="optional">csound-gui</packagereq>
       <packagereq type="optional">Democracy</packagereq>
       <packagereq type="optional">dvdauthor</packagereq>
       <packagereq type="optional">dvdisaster</packagereq>
@@ -1059,6 +1069,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">BackupPC</packagereq>
+      <packagereq type="default">bonnie++</packagereq>
       <packagereq type="default">NetworkManager-openvpn</packagereq>
       <packagereq type="default">NetworkManager-vpnc</packagereq>
       <packagereq type="default">openvpn</packagereq>