diff --git a/comps-f10.xml.in b/comps-f10.xml.in
index 5724e0f2..823a2953 100644
--- a/comps-f10.xml.in
+++ b/comps-f10.xml.in
@@ -4469,6 +4469,7 @@
       <packagereq type="optional">am-utils</packagereq>
       <packagereq type="optional">amanda-client</packagereq>
       <packagereq type="optional">apcupsd</packagereq>
+      <packagereq type="optional">apcupsd-gui</packagereq>
       <packagereq type="optional">apg</packagereq>
       <packagereq type="optional">apt</packagereq>
       <packagereq type="optional">arc</packagereq>
@@ -4491,6 +4492,7 @@
       <packagereq type="optional">crash</packagereq>
       <packagereq type="optional">createrepo</packagereq>
       <packagereq type="optional">dar</packagereq>
+      <packagereq type="optional">ddclient</packagereq>
       <packagereq type="optional">denyhosts</packagereq>
       <packagereq type="optional">dkms</packagereq>
       <packagereq type="optional">dnrd</packagereq>
@@ -4507,6 +4509,7 @@
       <packagereq type="optional">ettercap</packagereq>
       <packagereq type="optional">fatsort</packagereq>
       <packagereq type="optional">fcron</packagereq>
+      <packagereq type="optional">fdupes</packagereq>
       <packagereq type="optional">fedora-package-config-apt</packagereq>
       <packagereq type="optional">fedora-package-config-smart</packagereq>
       <packagereq type="optional">festival</packagereq>
@@ -4534,10 +4537,13 @@
       <packagereq type="optional">gxemul</packagereq>
       <packagereq type="optional">hercules</packagereq>
       <packagereq type="optional">hfsplus-tools</packagereq>
+      <packagereq type="optional">htop</packagereq>
       <packagereq type="optional">hyperestraier</packagereq>
       <packagereq type="optional">ibmonitor</packagereq>
+      <packagereq type="optional">iftop</packagereq>
       <packagereq type="optional">inadyn-mt</packagereq>
       <packagereq type="optional">incron</packagereq>
+      <packagereq type="optional">iotop</packagereq>
       <packagereq type="optional">ip6sic</packagereq>
       <packagereq type="optional">iptraf</packagereq>
       <packagereq type="optional">isic</packagereq>
@@ -4561,10 +4567,15 @@
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">net-snmp-utils</packagereq>
       <packagereq type="optional">netgo</packagereq>
+      <packagereq type="optional">nethogs</packagereq>
       <packagereq type="optional">netstat-nat</packagereq>
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nmap-frontend</packagereq>
+      <packagereq type="optional">noip</packagereq>
       <packagereq type="optional">nomarch</packagereq>
+      <packagereq type="optional">nrg2iso</packagereq>
+      <packagereq type="optional">ntp-perl</packagereq>
+      <packagereq type="optional">ntpdate</packagereq>
       <packagereq type="optional">nut</packagereq>
       <packagereq type="optional">nx</packagereq>
       <packagereq type="optional">obexfs</packagereq>
diff --git a/comps-f11.xml.in b/comps-f11.xml.in
index fdf72b58..42af4736 100644
--- a/comps-f11.xml.in
+++ b/comps-f11.xml.in
@@ -5193,6 +5193,7 @@
       <packagereq type="optional">am-utils</packagereq>
       <packagereq type="optional">amanda-client</packagereq>
       <packagereq type="optional">apcupsd</packagereq>
+      <packagereq type="optional">apcupsd-gui</packagereq>
       <packagereq type="optional">apg</packagereq>
       <packagereq type="optional">apt</packagereq>
       <packagereq type="optional">arc</packagereq>
@@ -5214,6 +5215,7 @@
       <packagereq type="optional">crash</packagereq>
       <packagereq type="optional">createrepo</packagereq>
       <packagereq type="optional">dar</packagereq>
+      <packagereq type="optional">ddclient</packagereq>
       <packagereq type="optional">denyhosts</packagereq>
       <packagereq type="optional">dkms</packagereq>
       <packagereq type="optional">dnrd</packagereq>
@@ -5230,6 +5232,7 @@
       <packagereq type="optional">ettercap</packagereq>
       <packagereq type="optional">fatsort</packagereq>
       <packagereq type="optional">fcron</packagereq>
+      <packagereq type="optional">fdupes</packagereq>
       <packagereq type="optional">fedora-package-config-apt</packagereq>
       <packagereq type="optional">fedora-package-config-smart</packagereq>
       <packagereq type="optional">festival</packagereq>
@@ -5257,10 +5260,13 @@
       <packagereq type="optional">gxemul</packagereq>
       <packagereq type="optional">hercules</packagereq>
       <packagereq type="optional">hfsplus-tools</packagereq>
+      <packagereq type="optional">htop</packagereq>
       <packagereq type="optional">hyperestraier</packagereq>
       <packagereq type="optional">ibmonitor</packagereq>
+      <packagereq type="optional">iftop</packagereq>
       <packagereq type="optional">inadyn-mt</packagereq>
       <packagereq type="optional">incron</packagereq>
+      <packagereq type="optional">iotop</packagereq>
       <packagereq type="optional">ip6sic</packagereq>
       <packagereq type="optional">iptraf</packagereq>
       <packagereq type="optional">ircp-tray</packagereq>
@@ -5283,10 +5289,15 @@
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">net-snmp-utils</packagereq>
       <packagereq type="optional">netgo</packagereq>
+      <packagereq type="optional">nethogs</packagereq>
       <packagereq type="optional">netstat-nat</packagereq>
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nmap-frontend</packagereq>
+      <packagereq type="optional">noip</packagereq>
       <packagereq type="optional">nomarch</packagereq>
+      <packagereq type="optional">nrg2iso</packagereq>
+      <packagereq type="optional">ntp-perl</packagereq>
+      <packagereq type="optional">ntpdate</packagereq>
       <packagereq type="optional">nut</packagereq>
       <packagereq type="optional">nx</packagereq>
       <packagereq type="optional">obexfs</packagereq>
diff --git a/comps-f12.xml.in b/comps-f12.xml.in
index 24ade070..3b8bfa65 100644
--- a/comps-f12.xml.in
+++ b/comps-f12.xml.in
@@ -5473,6 +5473,7 @@
       <packagereq type="optional">am-utils</packagereq>
       <packagereq type="optional">amanda-client</packagereq>
       <packagereq type="optional">apcupsd</packagereq>
+      <packagereq type="optional">apcupsd-gui</packagereq>
       <packagereq type="optional">apg</packagereq>
       <packagereq type="optional">apt</packagereq>
       <packagereq type="optional">arc</packagereq>
@@ -5494,6 +5495,7 @@
       <packagereq type="optional">crash</packagereq>
       <packagereq type="optional">createrepo</packagereq>
       <packagereq type="optional">dar</packagereq>
+      <packagereq type="optional">ddclient</packagereq>
       <packagereq type="optional">denyhosts</packagereq>
       <packagereq type="optional">dkms</packagereq>
       <packagereq type="optional">dnrd</packagereq>
@@ -5510,6 +5512,7 @@
       <packagereq type="optional">ettercap</packagereq>
       <packagereq type="optional">fatsort</packagereq>
       <packagereq type="optional">fcron</packagereq>
+      <packagereq type="optional">fdupes</packagereq>
       <packagereq type="optional">fedora-package-config-apt</packagereq>
       <packagereq type="optional">fedora-package-config-smart</packagereq>
       <packagereq type="optional">festival</packagereq>
@@ -5537,10 +5540,13 @@
       <packagereq type="optional">gxemul</packagereq>
       <packagereq type="optional">hercules</packagereq>
       <packagereq type="optional">hfsplus-tools</packagereq>
+      <packagereq type="optional">htop</packagereq>
       <packagereq type="optional">hyperestraier</packagereq>
       <packagereq type="optional">ibmonitor</packagereq>
+      <packagereq type="optional">iftop</packagereq>
       <packagereq type="optional">inadyn-mt</packagereq>
       <packagereq type="optional">incron</packagereq>
+      <packagereq type="optional">iotop</packagereq>
       <packagereq type="optional">ip6sic</packagereq>
       <packagereq type="optional">iptraf</packagereq>
       <packagereq type="optional">ircp-tray</packagereq>
@@ -5563,10 +5569,15 @@
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">net-snmp-utils</packagereq>
       <packagereq type="optional">netgo</packagereq>
+      <packagereq type="optional">nethogs</packagereq>
       <packagereq type="optional">netstat-nat</packagereq>
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nmap-frontend</packagereq>
+      <packagereq type="optional">noip</packagereq>
       <packagereq type="optional">nomarch</packagereq>
+      <packagereq type="optional">nrg2iso</packagereq>
+      <packagereq type="optional">ntp-perl</packagereq>
+      <packagereq type="optional">ntpdate</packagereq>
       <packagereq type="optional">nut</packagereq>
       <packagereq type="optional">nx</packagereq>
       <packagereq type="optional">obexfs</packagereq>
diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index 7192ec27..31da9f96 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -5429,6 +5429,7 @@
       <packagereq type="optional">am-utils</packagereq>
       <packagereq type="optional">amanda-client</packagereq>
       <packagereq type="optional">apcupsd</packagereq>
+      <packagereq type="optional">apcupsd-gui</packagereq>
       <packagereq type="optional">apg</packagereq>
       <packagereq type="optional">apt</packagereq>
       <packagereq type="optional">arc</packagereq>
@@ -5450,6 +5451,7 @@
       <packagereq type="optional">crash</packagereq>
       <packagereq type="optional">createrepo</packagereq>
       <packagereq type="optional">dar</packagereq>
+      <packagereq type="optional">ddclient</packagereq>
       <packagereq type="optional">denyhosts</packagereq>
       <packagereq type="optional">dkms</packagereq>
       <packagereq type="optional">dnrd</packagereq>
@@ -5466,6 +5468,7 @@
       <packagereq type="optional">ettercap</packagereq>
       <packagereq type="optional">fatsort</packagereq>
       <packagereq type="optional">fcron</packagereq>
+      <packagereq type="optional">fdupes</packagereq>
       <packagereq type="optional">fedora-package-config-apt</packagereq>
       <packagereq type="optional">fedora-package-config-smart</packagereq>
       <packagereq type="optional">festival</packagereq>
@@ -5493,10 +5496,13 @@
       <packagereq type="optional">gxemul</packagereq>
       <packagereq type="optional">hercules</packagereq>
       <packagereq type="optional">hfsplus-tools</packagereq>
+      <packagereq type="optional">htop</packagereq>
       <packagereq type="optional">hyperestraier</packagereq>
       <packagereq type="optional">ibmonitor</packagereq>
+      <packagereq type="optional">iftop</packagereq>
       <packagereq type="optional">inadyn-mt</packagereq>
       <packagereq type="optional">incron</packagereq>
+      <packagereq type="optional">iotop</packagereq>
       <packagereq type="optional">ip6sic</packagereq>
       <packagereq type="optional">iptraf</packagereq>
       <packagereq type="optional">ircp-tray</packagereq>
@@ -5519,10 +5525,15 @@
       <packagereq type="optional">nagios</packagereq>
       <packagereq type="optional">net-snmp-utils</packagereq>
       <packagereq type="optional">netgo</packagereq>
+      <packagereq type="optional">nethogs</packagereq>
       <packagereq type="optional">netstat-nat</packagereq>
       <packagereq type="optional">nfswatch</packagereq>
       <packagereq type="optional">nmap-frontend</packagereq>
+      <packagereq type="optional">noip</packagereq>
       <packagereq type="optional">nomarch</packagereq>
+      <packagereq type="optional">nrg2iso</packagereq>
+      <packagereq type="optional">ntp-perl</packagereq>
+      <packagereq type="optional">ntpdate</packagereq>
       <packagereq type="optional">nut</packagereq>
       <packagereq type="optional">nx</packagereq>
       <packagereq type="optional">obexfs</packagereq>