diff --git a/comps-f14.xml.in b/comps-f14.xml.in
index 51e3376..4381fca 100644
--- a/comps-f14.xml.in
+++ b/comps-f14.xml.in
@@ -229,9 +229,7 @@
       <packagereq type="conditional" requires="aspell">aspell-en</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-en</packagereq>
       <packagereq type="default">acpid</packagereq>
-      <packagereq type="default">ccid</packagereq>
       <packagereq type="default">cifs-utils</packagereq>
-      <packagereq type="default">coolkey</packagereq>
       <packagereq type="default">cpuspeed</packagereq>
       <packagereq type="default">cryptsetup-luks</packagereq>
       <packagereq type="default">device-mapper-multipath</packagereq>
@@ -242,12 +240,10 @@
       <packagereq type="default">eject</packagereq>
       <packagereq type="default">fedora-release-notes</packagereq>
       <packagereq type="default">finger</packagereq>
-      <packagereq type="default">fprintd-pam</packagereq>
       <packagereq type="default">ftp</packagereq>
       <packagereq type="default">gnupg2</packagereq>
       <packagereq type="default">hunspell</packagereq>
       <packagereq type="default">iptstate</packagereq>
-      <packagereq type="default">irda-utils</packagereq>
       <packagereq type="default">irqbalance</packagereq>
       <packagereq type="default">jwhois</packagereq>
       <packagereq type="default">krb5-workstation</packagereq>
@@ -265,7 +261,6 @@
       <packagereq type="default">nss_ldap</packagereq>
       <packagereq type="default">ntfs-3g</packagereq>
       <packagereq type="default">ntfsprogs</packagereq>
-      <packagereq type="default">numactl</packagereq>
       <packagereq type="default">openssh-clients</packagereq>
       <packagereq type="default">PackageKit-yum-plugin</packagereq>
       <packagereq type="default">pam_ccreds</packagereq>
@@ -273,7 +268,6 @@
       <packagereq type="default">pam_passwdqc</packagereq>
       <packagereq type="default">pam_pkcs11</packagereq>
       <packagereq type="default">pam_smb</packagereq>
-      <packagereq type="default">pcmciautils</packagereq>
       <packagereq type="default">perf</packagereq>
       <packagereq type="default">pinfo</packagereq>
       <packagereq type="default">pm-utils</packagereq>
@@ -319,14 +313,12 @@
       <packagereq type="optional">bridge-utils</packagereq>
       <packagereq type="optional">brltty</packagereq>
       <packagereq type="optional">btrfs-progs</packagereq>
-      <packagereq type="optional">fbset</packagereq>
       <packagereq type="optional">gnupg2-smime</packagereq>
       <packagereq type="optional">gpart</packagereq>
       <packagereq type="optional">gpgme</packagereq>
       <packagereq type="optional">gpm</packagereq>
       <packagereq type="optional">hardlink</packagereq>
       <packagereq type="optional">hfsutils</packagereq>
-      <packagereq type="optional">iscsi-initiator-utils</packagereq>
       <packagereq type="optional">jfsutils</packagereq>
       <packagereq type="optional">kexec-tools</packagereq>
       <packagereq type="optional">ksh</packagereq>
@@ -3075,15 +3067,61 @@
     <_description>This group is a collection of tools for various hardware specific utilities.</_description>
     <default>true</default>
     <uservisible>true</uservisible>
+    <grouplist>
+      <groupid>hardware-support-misc</groupid>
+      <groupid>hardware-support-network</groupid>
+      <groupid>hardware-support-server</groupid>
+    </grouplist>
+  </group>
+  <group>
+    <id>hardware-support-misc</id>
+    <_name>Miscellaneuous Hardware Support</_name>
+    <_description>This group is a collection of tools and firmware for various hardware devices.</_description>
+    <default>true</default>
+    <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">alsa-firmware</packagereq>
+      <packagereq type="default">ccid</packagereq>
+      <packagereq type="default">coolkey</packagereq>
+      <packagereq type="default">fprintd-pam</packagereq>
+      <packagereq type="default">irda-utils</packagereq>
+      <packagereq type="default">ivtv-firmware</packagereq>
+      <packagereq type="default">pcmciautils</packagereq>
+      <packagereq type="optional">acpi</packagereq>
+      <packagereq type="optional">acpitool</packagereq>
+      <packagereq type="optional">cmospwd</packagereq>
+      <packagereq type="optional">ctapi-cyberjack</packagereq>
+      <packagereq type="optional">ctapi-cyberjack-pcsc</packagereq>
+      <packagereq type="optional">ctapi-cyberjack-tools</packagereq>
+      <packagereq type="optional">fbset</packagereq>
+      <packagereq type="optional">firmware-addon-dell</packagereq>
+      <packagereq type="optional">gpsd</packagereq>
+      <packagereq type="optional">gpsd-clients</packagereq>
+      <packagereq type="optional">gypsy</packagereq>
+      <packagereq type="optional">hddtemp</packagereq>
+      <packagereq type="optional">hdparm</packagereq>
+      <packagereq type="optional">iscan-firmware</packagereq>
+      <packagereq type="optional">isight-firmware-tools</packagereq>
+      <packagereq type="optional">multican</packagereq>
+      <packagereq type="optional">openct</packagereq>
+      <packagereq type="optional">opensc</packagereq>
+      <packagereq type="optional">s3switch</packagereq>
+      <packagereq type="optional">tpb</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>hardware-support-network</id>
+    <_name>Network Hardware Support</_name>
+    <_description>This group is a collection of tools and firmware for various network devices.</_description>
+    <default>true</default>
+    <uservisible>true</uservisible>
+    <packagelist>
       <packagereq type="default">ar9170-firmware</packagereq>
       <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">b43-fwcutter</packagereq>
       <packagereq type="default">b43-openfwwf</packagereq>
       <packagereq type="default">ipw2100-firmware</packagereq>
       <packagereq type="default">ipw2200-firmware</packagereq>
-      <packagereq type="default">ivtv-firmware</packagereq>
       <packagereq type="default">iwl1000-firmware</packagereq>
       <packagereq type="default">iwl3945-firmware</packagereq>
       <packagereq type="default">iwl4965-firmware</packagereq>
@@ -3091,38 +3129,29 @@
       <packagereq type="default">iwl5150-firmware</packagereq>
       <packagereq type="default">iwl6000-firmware</packagereq>
       <packagereq type="default">libertas-usb8388-firmware</packagereq>
-      <packagereq type="default">printer-filters</packagereq>
+      <packagereq type="default">rt61pci-firmware</packagereq>
+      <packagereq type="default">rt73usb-firmware</packagereq>
+      <packagereq type="default">ueagle-atm4-firmware</packagereq>
+      <packagereq type="default">zd1211-firmware</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>hardware-support-server</id>
+    <_name>Wireless Network Hardware Support</_name>
+    <_description>This group is a collection of tools and firmware for various wireless network.</_description>
+    <default>true</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">numactl</packagereq>
       <packagereq type="default">ql2100-firmware</packagereq>
       <packagereq type="default">ql2200-firmware</packagereq>
       <packagereq type="default">ql23xx-firmware</packagereq>
       <packagereq type="default">ql2400-firmware</packagereq>
       <packagereq type="default">ql2500-firmware</packagereq>
-      <packagereq type="default">rt61pci-firmware</packagereq>
-      <packagereq type="default">rt73usb-firmware</packagereq>
-      <packagereq type="default">ueagle-atm4-firmware</packagereq>
-      <packagereq type="default">zd1211-firmware</packagereq>
-      <packagereq type="optional">acpi</packagereq>
-      <packagereq type="optional">acpitool</packagereq>
-      <packagereq type="optional">cmospwd</packagereq>
-      <packagereq type="optional">ctapi-cyberjack</packagereq>
-      <packagereq type="optional">ctapi-cyberjack-pcsc</packagereq>
-      <packagereq type="optional">ctapi-cyberjack-tools</packagereq>
-      <packagereq type="optional">firmware-addon-dell</packagereq>
-      <packagereq type="optional">gpsd</packagereq>
-      <packagereq type="optional">gpsd-clients</packagereq>
-      <packagereq type="optional">gypsy</packagereq>
-      <packagereq type="optional">hddtemp</packagereq>
-      <packagereq type="optional">hdparm</packagereq>
+      <packagereq type="optional">iscsi-initiator-utils</packagereq>
       <packagereq type="optional">i8kutils</packagereq>
-      <packagereq type="optional">iscan-firmware</packagereq>
-      <packagereq type="optional">isight-firmware-tools</packagereq>
       <packagereq type="optional">libifp</packagereq>
       <packagereq type="optional">lsscsi</packagereq>
-      <packagereq type="optional">multican</packagereq>
-      <packagereq type="optional">openct</packagereq>
-      <packagereq type="optional">opensc</packagereq>
-      <packagereq type="optional">s3switch</packagereq>
-      <packagereq type="optional">tpb</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4905,6 +4934,7 @@
       <packagereq type="default">hplip</packagereq>
       <packagereq type="default">mpage</packagereq>
       <packagereq type="default">paps</packagereq>
+      <packagereq type="default">printer-filters</packagereq>
       <packagereq type="default">samba-client</packagereq>
       <packagereq type="default">system-config-printer</packagereq>
       <packagereq type="default">system-config-printer-udev</packagereq>