diff --git a/comps-f14.xml.in b/comps-f14.xml.in
index 4bf2ae42..72fbdc41 100644
--- a/comps-f14.xml.in
+++ b/comps-f14.xml.in
@@ -859,8 +859,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <!-- 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">fedora-gnome-theme</packagereq>
@@ -872,7 +870,13 @@
       <packagereq type="mandatory">metacity</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">polkit-gnome</packagereq>
-      <packagereq type="mandatory">xorg-x11-drivers</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-ati</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-evdev</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-fbdev</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-intel</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-nouveau</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-synaptics</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-vesa</packagereq>
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index edef1932..b89ea523 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -827,8 +827,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <!-- 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">gdm</packagereq>
@@ -840,7 +838,13 @@
       <packagereq type="mandatory">metacity</packagereq>
       <packagereq type="mandatory">nautilus</packagereq>
       <packagereq type="mandatory">polkit-gnome</packagereq>
-      <packagereq type="mandatory">xorg-x11-drivers</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-ati</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-evdev</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-fbdev</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-intel</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-nouveau</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-synaptics</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-vesa</packagereq>
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index f5ef1d03..9d2f19e6 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -824,8 +824,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <!-- 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">dconf</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
@@ -837,7 +835,13 @@
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">metacity</packagereq>
       <packagereq type="mandatory">notification-daemon</packagereq>
-      <packagereq type="mandatory">xorg-x11-drivers</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-ati</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-evdev</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-fbdev</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-intel</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-nouveau</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-synaptics</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-vesa</packagereq>
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index 05b3f7b5..6e1e81da 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -850,8 +850,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <!-- 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">dconf</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
@@ -863,7 +861,13 @@
       <packagereq type="mandatory">gvfs-fuse</packagereq>
       <packagereq type="mandatory">metacity</packagereq>
       <packagereq type="mandatory">notification-daemon</packagereq>
-      <packagereq type="mandatory">xorg-x11-drivers</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-ati</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-evdev</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-fbdev</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-intel</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-nouveau</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-synaptics</packagereq>
+      <packagereq type="mandatory">xorg-x11-drv-vesa</packagereq>
       <packagereq type="mandatory">xorg-x11-server-Xorg</packagereq>
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>