diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index 34e36729..f6e75b3a 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -827,16 +827,16 @@
       <!-- Just the mandatory packages from base-x. Might want to cut this
            down to a small set of specific drivers in the future. -->
       <packagereq type="mandatory">control-center</packagereq>
-      <packagereq type="mandatory">desktop-backgrounds-basic</packagereq>
+      <packagereq type="mandatory">dconf</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
       <packagereq type="mandatory">gnome-panel</packagereq>
       <packagereq type="mandatory">gnome-session</packagereq>
-      <packagereq type="mandatory">gnome-terminal</packagereq>
+      <packagereq type="mandatory">gnome-shell</packagereq>
       <packagereq type="mandatory">gnome-themes-standard</packagereq>
+      <packagereq type="mandatory">gnome-terminal</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">metacity</packagereq>
-      <packagereq type="mandatory">nautilus</packagereq>
-      <packagereq type="mandatory">polkit-gnome</packagereq>
+      <packagereq type="mandatory">notification-daemon</packagereq>
       <packagereq type="mandatory">xorg-x11-drivers</packagereq>
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
@@ -844,9 +844,10 @@
       <packagereq type="default">avahi</packagereq>
       <packagereq type="default">gdm-plugin-fingerprint</packagereq>
       <packagereq type="default">gnome-packagekit</packagereq>
-      <packagereq type="default">libcanberra-gtk2</packagereq>
+      <packagereq type="default">libcanberra-gtk3</packagereq>
+      <packagereq type="default">nautilus</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
-      <packagereq type="default">notification-daemon</packagereq>
+      <packagereq type="default">polkit-gnome</packagereq>
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
     </packagelist>
diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index d6766efc..994a0b40 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -827,16 +827,16 @@
       <!-- Just the mandatory packages from base-x. Might want to cut this
            down to a small set of specific drivers in the future. -->
       <packagereq type="mandatory">control-center</packagereq>
-      <packagereq type="mandatory">desktop-backgrounds-basic</packagereq>
+      <packagereq type="mandatory">dconf</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
       <packagereq type="mandatory">gnome-panel</packagereq>
       <packagereq type="mandatory">gnome-session</packagereq>
-      <packagereq type="mandatory">gnome-terminal</packagereq>
+      <packagereq type="mandatory">gnome-shell</packagereq>
       <packagereq type="mandatory">gnome-themes-standard</packagereq>
+      <packagereq type="mandatory">gnome-terminal</packagereq>
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">metacity</packagereq>
-      <packagereq type="mandatory">nautilus</packagereq>
-      <packagereq type="mandatory">polkit-gnome</packagereq>
+      <packagereq type="mandatory">notification-daemon</packagereq>
       <packagereq type="mandatory">xorg-x11-drivers</packagereq>
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
@@ -844,9 +844,10 @@
       <packagereq type="default">avahi</packagereq>
       <packagereq type="default">gdm-plugin-fingerprint</packagereq>
       <packagereq type="default">gnome-packagekit</packagereq>
-      <packagereq type="default">libcanberra-gtk2</packagereq>
+      <packagereq type="default">libcanberra-gtk3</packagereq>
+      <packagereq type="default">nautilus</packagereq>
       <packagereq type="default">NetworkManager-gnome</packagereq>
-      <packagereq type="default">notification-daemon</packagereq>
+      <packagereq type="default">polkit-gnome</packagereq>
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
     </packagelist>