diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index 6e41110..317fda1 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -2846,38 +2846,36 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="mandatory">atk-devel</packagereq>
-      <packagereq type="mandatory">GConf2-devel</packagereq>
+      <packagereq type="mandatory">clutter-devel</packagereq>
+      <packagereq type="mandatory">dbus-devel</packagereq>
       <packagereq type="mandatory">glib2-devel</packagereq>
-      <packagereq type="mandatory">gtk2-devel</packagereq>
-      <packagereq type="mandatory">libbonobo-devel</packagereq>
-      <packagereq type="mandatory">libbonoboui-devel</packagereq>
-      <packagereq type="mandatory">libglade2-devel</packagereq>
-      <packagereq type="mandatory">libgnome-devel</packagereq>
-      <packagereq type="mandatory">libgnomecanvas-devel</packagereq>
-      <packagereq type="mandatory">libgnomeui-devel</packagereq>
-      <packagereq type="mandatory">ORBit2-devel</packagereq>
+      <packagereq type="mandatory">gstreamer-devel</packagereq>
+      <packagereq type="mandatory">gtk3-devel-docs</packagereq>
       <packagereq type="mandatory">pango-devel</packagereq>
-      <packagereq type="default">at-spi-devel</packagereq>
+      <packagereq type="mandatory">webkitgtk3-devel</packagereq>
+      <packagereq type="default">at-spi2-core-devel</packagereq>
+      <packagereq type="default">clutter-gtk-devel</packagereq>
       <packagereq type="default">devhelp</packagereq>
       <packagereq type="default">evolution-data-server-devel</packagereq>
       <packagereq type="default">glade3</packagereq>
       <packagereq type="default">gnome-common</packagereq>
-      <packagereq type="default">gnome-desktop-devel</packagereq>
       <packagereq type="default">gnome-devel-docs</packagereq>
-      <packagereq type="default">gnome-panel-devel</packagereq>
-      <packagereq type="default">gnome-pilot-devel</packagereq>
+      <packagereq type="default">gnome-keyring-devel</packagereq>
       <packagereq type="default">gtk-doc</packagereq>
+      <packagereq type="default">gtk2-devel</packagereq>
       <packagereq type="default">gtk2-devel-docs</packagereq>
-      <packagereq type="default">libgtop2-devel</packagereq>
-      <packagereq type="default">pygtk2-devel</packagereq>
-      <packagereq type="default">xulrunner-devel</packagereq>
+      <packagereq type="default">libcanberra-devel</packagereq>
+      <packagereq type="default">libgda-devel</packagereq>
+      <packagereq type="default">libnotify-devel</packagereq>
       <packagereq type="optional">anjuta</packagereq>
       <packagereq type="optional">anjuta-doc</packagereq>
+      <packagereq type="optional">at-spi-devel</packagereq>
       <packagereq type="optional">bakery-devel</packagereq>
       <packagereq type="optional">bit-devel</packagereq>
       <packagereq type="optional">bit-gtkmm-devel</packagereq>
       <packagereq type="optional">cairomm-devel</packagereq>
       <packagereq type="optional">cairomm-doc</packagereq>
+      <packagereq type="optional">clutter-gst-devel</packagereq>
       <packagereq type="optional">conexus-dbus-devel</packagereq>
       <packagereq type="optional">conexus-devel</packagereq>
       <packagereq type="optional">conexus-doc</packagereq>
@@ -2887,9 +2885,13 @@
       <packagereq type="optional">conexus-ssl-devel</packagereq>
       <packagereq type="optional">ddd</packagereq>
       <packagereq type="optional">gazpacho</packagereq>
+      <packagereq type="optional">GConf2-devel</packagereq>
       <packagereq type="optional">gconfmm26-devel</packagereq>
       <packagereq type="optional">glade2</packagereq>
       <packagereq type="optional">glibmm24-devel</packagereq>
+      <packagereq type="optional">gnome-desktop-devel</packagereq>
+      <packagereq type="optional">gnome-panel-devel</packagereq>
+      <packagereq type="optional">gnome-pilot-devel</packagereq>
       <packagereq type="optional">gnome-python2-gda-devel</packagereq>
       <packagereq type="optional">gnome-valgrind-session</packagereq>
       <packagereq type="optional">gnome-vfs2-devel</packagereq>
@@ -2901,26 +2903,37 @@
       <packagereq type="optional">gtkmm24-devel</packagereq>
       <packagereq type="optional">gtkparasite</packagereq>
       <packagereq type="optional">libart_lgpl-devel</packagereq>
+      <packagereq type="optional">libbonobo-devel</packagereq>
+      <packagereq type="optional">libbonoboui-devel</packagereq>
       <packagereq type="optional">libgconf-java</packagereq>
       <packagereq type="optional">libglade-java</packagereq>
+      <packagereq type="optional">libglade2-devel</packagereq>
       <packagereq type="optional">libglademm24-devel</packagereq>
+      <packagereq type="optional">libgnome-devel</packagereq>
       <packagereq type="optional">libgnome-java</packagereq>
+      <packagereq type="optional">libgnomecanvas-devel</packagereq>
       <packagereq type="optional">libgnomecanvasmm26-devel</packagereq>
       <packagereq type="optional">libgnomemm26-devel</packagereq>
       <packagereq type="optional">libgnomeprintui22-devel</packagereq>
+      <packagereq type="optional">libgnomeui-devel</packagereq>
       <packagereq type="optional">libgnomeuimm26-devel</packagereq>
       <packagereq type="optional">libgtk-java</packagereq>
+      <packagereq type="optional">libgtop2-devel</packagereq>
       <packagereq type="optional">libsexy-devel</packagereq>
       <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">papyrus-devel</packagereq>
       <packagereq type="optional">papyrus-doc</packagereq>
       <packagereq type="optional">papyrus-extras-devel</packagereq>
       <packagereq type="optional">papyrus-gtkmm-devel</packagereq>
       <packagereq type="optional">plotmm-devel</packagereq>
+      <packagereq type="optional">pygtk2-devel</packagereq>
       <packagereq type="optional">scim-devel</packagereq>
       <packagereq type="optional">vala</packagereq>
+      <packagereq type="optional">webkitgtk-devel</packagereq>
+      <packagereq type="optional">xulrunner-devel</packagereq>
     </packagelist>
   </group>
   <group>