diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index fd76488e..7c811780 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -2447,22 +2447,20 @@
       <packagereq type="default">gnome-disk-utility</packagereq>
       <packagereq type="default">gnome-disk-utility-nautilus</packagereq>
       <packagereq type="default">gnome-documents</packagereq>
+      <packagereq type="default">gnome-font-viewer</packagereq>
       <packagereq type="default">gnome-games</packagereq>
       <packagereq type="default">gnome-icon-theme</packagereq>
       <packagereq type="default">gnome-icon-theme-extras</packagereq>
       <packagereq type="default">gnome-icon-theme-symbolic</packagereq>
       <packagereq type="default">gnome-media</packagereq>
       <packagereq type="default">gnome-packagekit</packagereq>
-      <packagereq type="default">gnome-power-manager</packagereq>
       <packagereq type="default">gnome-screensaver</packagereq>
       <packagereq type="default">gnome-screenshot</packagereq>
-      <packagereq type="default">gnome-search-tool</packagereq>
       <packagereq type="default">gnome-system-log</packagereq>
       <packagereq type="default">gnome-system-monitor</packagereq>
       <packagereq type="default">gnome-terminal</packagereq>
       <packagereq type="default">gnome-user-docs</packagereq>
       <packagereq type="default">gucharmap</packagereq>
-      <packagereq type="default">gvfs-archive</packagereq>
       <packagereq type="default">gvfs-fuse</packagereq>
       <packagereq type="default">gvfs-gphoto2</packagereq>
       <packagereq type="default">gvfs-smb</packagereq>
@@ -2490,7 +2488,6 @@
       <packagereq type="default">policycoreutils-restorecond</packagereq>
       <packagereq type="default">polkit-gnome</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
-      <packagereq type="default">pyatspi</packagereq>
       <packagereq type="default">sane-backends-drivers-scanners</packagereq>
       <packagereq type="default">seahorse</packagereq>
       <packagereq type="default">shotwell</packagereq>
@@ -2520,7 +2517,9 @@
       <packagereq type="optional">gnome-phone-manager</packagereq>
       <packagereq type="optional">gnome-pilot</packagereq>
       <packagereq type="optional">gnome-pilot-conduits</packagereq>
+      <packagereq type="optional">gnome-power-manager</packagereq>
       <packagereq type="optional">gnome-schedule</packagereq>
+      <packagereq type="optional">gnome-search-tool</packagereq>
       <packagereq type="optional">gnome-system-log</packagereq>
       <packagereq type="optional">gnome-theme-curvylooks</packagereq>
       <packagereq type="optional">gnote</packagereq>
@@ -2531,6 +2530,7 @@
       <packagereq type="optional">gtkhash-nautilus</packagereq>
       <packagereq type="optional">gtrayicon</packagereq>
       <packagereq type="optional">gtweakui</packagereq>
+      <packagereq type="optional">gvfs-archive</packagereq>
       <packagereq type="optional">gvfs-obexftp</packagereq>
       <packagereq type="optional">hamster-applet</packagereq>
       <packagereq type="optional">istanbul</packagereq>
@@ -2548,7 +2548,8 @@
       <packagereq type="optional">sane-backends-drivers-cameras</packagereq>
       <packagereq type="optional">scim-gtk</packagereq>
       <packagereq type="optional">screenruler</packagereq>
-      <packagereq type="optional">seahorse-plugins</packagereq>
+      <packagereq type="optional">seahorse-sharing</packagereq>
+      <packagereq type="optional">seahorse-nautilus</packagereq>
       <packagereq type="optional">stardict-dic-en</packagereq>
       <packagereq type="optional">tango-icon-theme</packagereq>
       <packagereq type="optional">tango-icon-theme-extras</packagereq>