diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index 1e226d99..6ced93f1 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -2693,6 +2693,7 @@
at-spi2-atk
at-spi2-core
avahi
+ baobab
brasero-nautilus
caribou
cheese
@@ -2714,6 +2715,7 @@
gnome-bluetooth
gnome-color-manager
gnome-contacts
+ gnome-dictionary
gnome-disk-utility
gnome-disk-utility-nautilus
gnome-documents
@@ -2725,10 +2727,12 @@
gnome-packagekit
gnome-power-manager
gnome-screensaver
+ gnome-screenshot
+ gnome-search-tool
+ gnome-system-log
gnome-system-monitor
gnome-terminal
gnome-user-docs
- gnome-utils
gucharmap
gvfs-archive
gvfs-fuse
diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index b013c1ef..a4aa15f5 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -2415,6 +2415,7 @@
at-spi2-atk
at-spi2-core
avahi
+ baobab
brasero-nautilus
caribou
cheese
@@ -2436,6 +2437,7 @@
gnome-bluetooth
gnome-color-manager
gnome-contacts
+ gnome-dictionary
gnome-disk-utility
gnome-disk-utility-nautilus
gnome-documents
@@ -2447,10 +2449,12 @@
gnome-packagekit
gnome-power-manager
gnome-screensaver
+ gnome-screenshot
+ gnome-search-tool
+ gnome-system-log
gnome-system-monitor
gnome-terminal
gnome-user-docs
- gnome-utils
gucharmap
gvfs-archive
gvfs-fuse