diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index a15f2e47..f03337a5 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -712,7 +712,6 @@
       <packagereq>brasero</packagereq>
       <packagereq>totem</packagereq>
       <packagereq>totem-mozplugin</packagereq>
-      <packagereq>gnome-calculator</packagereq>
       <packagereq>lightdm-gtk</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>gedit</packagereq>
@@ -725,22 +724,25 @@
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
       <packagereq>nm-connection-editor</packagereq>
-      <packagereq>gnome-icon-theme</packagereq>
       <packagereq>gnome-backgrounds</packagereq>
+      <packagereq>gnome-calculator</packagereq>
       <packagereq>gnome-disk-utility</packagereq>
+      <packagereq>gnome-icon-theme</packagereq>
+      <packagereq>gnome-icon-theme-extras</packagereq>
+      <packagereq>gnome-icon-theme-legacy</packagereq>
       <packagereq>gnome-packagekit</packagereq>
       <packagereq>gnome-screenshot</packagereq>
+      <packagereq>gnome-screensaver</packagereq>
+      <packagereq>gnome-system-monitor</packagereq>
+      <packagereq>gnome-terminal</packagereq>
+      <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>simple-scan</packagereq>
       <packagereq>sane-backends-drivers-scanners</packagereq>
-      <packagereq>gnome-screensaver</packagereq>
-      <packagereq>gnome-system-monitor</packagereq>
-      <packagereq>gnome-terminal</packagereq>
-      <packagereq>gnome-icon-theme-extras</packagereq>
-      <packagereq>gnome-icon-theme-legacy</packagereq>
       <packagereq>alsa-plugins-pulseaudio</packagereq>
+      <packagereq>system-config-users</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index 6378f3ba..8dcce49f 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -713,7 +713,6 @@
       <packagereq>brasero</packagereq>
       <packagereq>totem</packagereq>
       <packagereq>totem-mozplugin</packagereq>
-      <packagereq>gnome-calculator</packagereq>
       <packagereq>lightdm-gtk</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>gedit</packagereq>
@@ -726,22 +725,25 @@
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
       <packagereq>nm-connection-editor</packagereq>
-      <packagereq>gnome-icon-theme</packagereq>
       <packagereq>gnome-backgrounds</packagereq>
+      <packagereq>gnome-calculator</packagereq>
       <packagereq>gnome-disk-utility</packagereq>
+      <packagereq>gnome-icon-theme</packagereq>
+      <packagereq>gnome-icon-theme-extras</packagereq>
+      <packagereq>gnome-icon-theme-legacy</packagereq>
       <packagereq>gnome-packagekit</packagereq>
       <packagereq>gnome-screenshot</packagereq>
+      <packagereq>gnome-screensaver</packagereq>
+      <packagereq>gnome-system-monitor</packagereq>
+      <packagereq>gnome-terminal</packagereq>
+      <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>simple-scan</packagereq>
       <packagereq>sane-backends-drivers-scanners</packagereq>
-      <packagereq>gnome-screensaver</packagereq>
-      <packagereq>gnome-system-monitor</packagereq>
-      <packagereq>gnome-terminal</packagereq>
-      <packagereq>gnome-icon-theme-extras</packagereq>
-      <packagereq>gnome-icon-theme-legacy</packagereq>
       <packagereq>alsa-plugins-pulseaudio</packagereq>
+      <packagereq>system-config-users</packagereq>
     </packagelist>
   </group>
   <group>