diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index bb91823d..7b5e203c 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -3241,12 +3241,9 @@
       <packagereq type="mandatory">pango-devel</packagereq>
       <packagereq type="mandatory">webkitgtk3-devel</packagereq>
       <packagereq type="default">at-spi2-core-devel</packagereq>
-      <packagereq type="default">clutter-gst-devel</packagereq>
       <packagereq type="default">clutter-gtk-devel</packagereq>
-      <packagereq type="default">diffstat</packagereq>
       <packagereq type="default">devhelp</packagereq>
       <packagereq type="default">evolution-data-server-devel</packagereq>
-      <packagereq type="default">gitg</packagereq>
       <packagereq type="default">glade</packagereq>
       <packagereq type="default">gnome-common</packagereq>
       <packagereq type="default">gnome-desktop3-devel</packagereq>
@@ -3254,11 +3251,12 @@
       <packagereq type="default">gobject-introspection</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
       <packagereq type="default">gtk-doc</packagereq>
-      <packagereq type="default">gtkparasite</packagereq>
+      <packagereq type="default">gtk2-devel</packagereq>
+      <packagereq type="default">gtk2-devel-docs</packagereq>
       <packagereq type="default">libcanberra-devel</packagereq>
+      <packagereq type="default">libgda-devel</packagereq>
       <packagereq type="default">libgnome-keyring-devel</packagereq>
       <packagereq type="default">libnotify-devel</packagereq>
-      <packagereq type="default">polkit-devel</packagereq>
       <packagereq type="optional">anjuta</packagereq>
       <packagereq type="optional">at-spi-devel</packagereq>
       <packagereq type="optional">bakery-devel</packagereq>
@@ -3273,14 +3271,15 @@
       <packagereq type="optional">gnome-desktop-devel</packagereq>
       <packagereq type="optional">gnome-panel-devel</packagereq>
       <packagereq type="optional">gnome-valgrind-session</packagereq>
+      <packagereq type="optional">gnome-vfs2-devel</packagereq>
+      <packagereq type="optional">gob2</packagereq>
       <packagereq type="optional">gtk+extra</packagereq>
-      <packagereq type="default">gtk2-devel</packagereq>
-      <packagereq type="default">gtk2-devel-docs</packagereq>
       <packagereq type="optional">gtkdatabox-devel</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
       <packagereq type="optional">gtkparasite</packagereq>
       <packagereq type="optional">libart_lgpl-devel</packagereq>
-      <packagereq type="optional">libgda-devel</packagereq>
+      <packagereq type="optional">libbonobo-devel</packagereq>
+      <packagereq type="optional">libbonoboui-devel</packagereq>
       <packagereq type="optional">libglade2-devel</packagereq>
       <packagereq type="optional">libglademm24-devel</packagereq>
       <packagereq type="optional">libgnome-devel</packagereq>
@@ -3293,6 +3292,7 @@
       <packagereq type="optional">libsexymm-devel</packagereq>
       <packagereq type="optional">libsigc++20-devel</packagereq>
       <packagereq type="optional">nemiver</packagereq>
+      <packagereq type="optional">ORBit2-devel</packagereq>
       <packagereq type="optional">plotmm-devel</packagereq>
       <packagereq type="optional">pygtk2-devel</packagereq>
       <packagereq type="optional">scim-devel</packagereq>
diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index a983bc3b..b2f268e5 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -3243,12 +3243,9 @@
       <packagereq type="mandatory">webkitgtk3-devel</packagereq>
       <packagereq type="default">glib2-doc</packagereq>
       <packagereq type="default">at-spi2-core-devel</packagereq>
-      <packagereq type="default">clutter-gst-devel</packagereq>
       <packagereq type="default">clutter-gtk-devel</packagereq>
-      <packagereq type="default">diffstat</packagereq>
       <packagereq type="default">devhelp</packagereq>
       <packagereq type="default">evolution-data-server-devel</packagereq>
-      <packagereq type="default">gitg</packagereq>
       <packagereq type="default">glade</packagereq>
       <packagereq type="default">git</packagereq>
       <packagereq type="default">gnome-common</packagereq>
@@ -3257,11 +3254,12 @@
       <packagereq type="default">gobject-introspection</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
       <packagereq type="default">gtk-doc</packagereq>
-      <packagereq type="default">gtkparasite</packagereq>
+      <packagereq type="default">gtk2-devel</packagereq>
+      <packagereq type="default">gtk2-devel-docs</packagereq>
       <packagereq type="default">libcanberra-devel</packagereq>
+      <packagereq type="default">libgda-devel</packagereq>
       <packagereq type="default">libgnome-keyring-devel</packagereq>
       <packagereq type="default">libnotify-devel</packagereq>
-      <packagereq type="default">polkit-devel</packagereq>
       <packagereq type="optional">anjuta</packagereq>
       <packagereq type="optional">at-spi-devel</packagereq>
       <packagereq type="optional">bakery-devel</packagereq>
@@ -3276,14 +3274,15 @@
       <packagereq type="optional">gnome-desktop-devel</packagereq>
       <packagereq type="optional">gnome-panel-devel</packagereq>
       <packagereq type="optional">gnome-valgrind-session</packagereq>
+      <packagereq type="optional">gnome-vfs2-devel</packagereq>
+      <packagereq type="optional">gob2</packagereq>
       <packagereq type="optional">gtk+extra</packagereq>
-      <packagereq type="default">gtk2-devel</packagereq>
-      <packagereq type="default">gtk2-devel-docs</packagereq>
       <packagereq type="optional">gtkdatabox-devel</packagereq>
       <packagereq type="optional">gtkmm24-devel</packagereq>
       <packagereq type="optional">gtkparasite</packagereq>
       <packagereq type="optional">libart_lgpl-devel</packagereq>
-      <packagereq type="optional">libgda-devel</packagereq>
+      <packagereq type="optional">libbonobo-devel</packagereq>
+      <packagereq type="optional">libbonoboui-devel</packagereq>
       <packagereq type="optional">libglade2-devel</packagereq>
       <packagereq type="optional">libglademm24-devel</packagereq>
       <packagereq type="optional">libgnome-devel</packagereq>
@@ -3296,6 +3295,7 @@
       <packagereq type="optional">libsexymm-devel</packagereq>
       <packagereq type="optional">libsigc++20-devel</packagereq>
       <packagereq type="optional">nemiver</packagereq>
+      <packagereq type="optional">ORBit2-devel</packagereq>
       <packagereq type="optional">plotmm-devel</packagereq>
       <packagereq type="optional">pygtk2-devel</packagereq>
       <packagereq type="optional">scim-devel</packagereq>