diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index e5c1606f..3481a7ef 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -313,7 +313,6 @@
       <packagereq>xorg-x11-drv-evdev</packagereq>
       <packagereq>xorg-x11-drv-fbdev</packagereq>
       <packagereq>xorg-x11-drv-freedreno</packagereq>
-      <packagereq>xorg-x11-drv-geode</packagereq>
       <packagereq>xorg-x11-drv-intel</packagereq>
       <packagereq>xorg-x11-drv-mga</packagereq>
       <packagereq>xorg-x11-drv-modesetting</packagereq>
@@ -330,6 +329,7 @@
       <packagereq>xorg-x11-utils</packagereq>
       <packagereq>xorg-x11-xauth</packagereq>
       <packagereq>xorg-x11-xinit</packagereq>
+      <packagereq type="optional">xorg-x11-drv-geode</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps-f25.xml.in b/comps-f25.xml.in
index 1a14360e..290678ee 100644
--- a/comps-f25.xml.in
+++ b/comps-f25.xml.in
@@ -313,7 +313,6 @@
       <packagereq>xorg-x11-drv-evdev</packagereq>
       <packagereq>xorg-x11-drv-fbdev</packagereq>
       <packagereq>xorg-x11-drv-freedreno</packagereq>
-      <packagereq>xorg-x11-drv-geode</packagereq>
       <packagereq>xorg-x11-drv-intel</packagereq>
       <packagereq>xorg-x11-drv-mga</packagereq>
       <packagereq>xorg-x11-drv-modesetting</packagereq>
@@ -330,6 +329,7 @@
       <packagereq>xorg-x11-utils</packagereq>
       <packagereq>xorg-x11-xauth</packagereq>
       <packagereq>xorg-x11-xinit</packagereq>
+      <packagereq type="optional">xorg-x11-drv-geode</packagereq>
     </packagelist>
   </group>
   <group>