diff --git a/xorg-x11-drivers.spec b/xorg-x11-drivers.spec
index 08a644a..46ea3fc 100644
--- a/xorg-x11-drivers.spec
+++ b/xorg-x11-drivers.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: User Interface/X Hardware Support
 
@@ -40,9 +40,8 @@ Requires: xorg-x11-drv-vmmouse
 %endif
 
 # irrelevant hardware
-
 %if !0%{?rhel}
-
+%if 0%{?fedora} < 21
 # These have KMS drivers for everything RHEL cares about
 Requires: xorg-x11-drv-cirrus
 Requires: xorg-x11-drv-mga
@@ -63,17 +62,28 @@ Requires: xorg-x11-drv-tdfx
 Requires: xorg-x11-drv-trident
 Requires: xorg-x11-drv-voodoo
 
+# This chipset has long since been EOLd, and afaik was only ever in x86 laptops
+%ifarch %{ix86}
+Requires: xorg-x11-drv-neomagic
+%endif
+
+# ARM kit
+%ifarch %{arm}
+Requires: xorg-x11-drv-omap
+Requires: xorg-x11-drv-armsoc
+Requires: xorg-x11-drv-freedreno
+%endif
+
+%endif
+
+# rhel-only exclusions that have maintainers in f21+: geode, openchrome
+
 # cyrix and nsc used to be here too, but are deprecated upstream and
 # should eventually get folded into -geode.
 %ifarch %{ix86}
 Requires: xorg-x11-drv-geode
 %endif
 
-# This chipset has long since been EOLd, and afaik was only ever in x86 laptops
-%ifarch %{ix86}
-Requires: xorg-x11-drv-neomagic
-%endif
-
 # Thus far via chips are only on x86 and amd64 motherboards.  This might be
 # the driver that ends up supporting the S3 Chrome cards, so don't be
 # surprised if this changes.
@@ -81,12 +91,6 @@ Requires: xorg-x11-drv-neomagic
 Requires: xorg-x11-drv-openchrome
 %endif
 
-# ARM kit
-%ifarch %{arm}
-Requires: xorg-x11-drv-omap
-Requires: xorg-x11-drv-armsoc
-Requires: xorg-x11-drv-freedreno
-%endif
 %endif
 
 %description
@@ -109,6 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 
 %changelog
+* Fri May 30 2014 Adam Jackson <ajax@redhat.com> 7.7-9
+- Drop from F21+: apm cirrus glint i128 i740 mach64 mga neomagic r128
+  rendition s3virge savage siliconmotion sis tdfx trident
+
 * Mon May 05 2014 Dennis Gilmore <dennis@ausil.us> 7.7-8
 - drop sparc section
 - add xorg-x11-drv-freedreno on arm arches