diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 167fe02..9c424d8 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   19.%{gitdate}%{?dist}
+Release:   20.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -525,6 +525,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 28 2009 Adam Jackson <ajax@redhat.com> 1.6.99-20.20090724
+- xserver-1.6.99-use-pci-access-boot.patch: Some chips (thanks Intel) will
+  change their PCI class at runtime if you disable their VGA decode, so
+  consider both 0x0300 and 0x0380 classes when looking for the boot VGA.
+
 * Tue Jul 28 2009 Adam Jackson <ajax@redhat.com> 1.6.99-19.20090724
 - xserver-1.6.99-randr-error-debugging.patch: Dump RANDR protocol errors
   to the log.
diff --git a/xserver-1.6.99-use-pci-access-boot.patch b/xserver-1.6.99-use-pci-access-boot.patch
index adfadaf..ba6ab16 100644
--- a/xserver-1.6.99-use-pci-access-boot.patch
+++ b/xserver-1.6.99-use-pci-access-boot.patch
@@ -1,20 +1,37 @@
+From 30f5e00909399b4503009e32831127d72d34f5df Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied@redhat.com>
 Date: Tue, 3 Mar 2009 10:58:33 -0500
 Subject: [PATCH] Primary video device hack - the revenge
 
+---
+ hw/xfree86/common/xf86pciBus.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
 diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index 8ed3567..183b1ba 100644
+index 8ed3567..74aeb44 100644
 --- a/hw/xfree86/common/xf86pciBus.c
 +++ b/hw/xfree86/common/xf86pciBus.c
+@@ -60,7 +60,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL;	/* PCI probe for video hw *
+ /* PCI classes that get included in xf86PciVideoInfo */
+ #define PCIINFOCLASSES(c) \
+     ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \
+-      || (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16)) )
++      || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) )
+ 
+ /*
+  * PCI classes that have messages printed always.  The others are only
 @@ -400,6 +400,11 @@ xf86PciProbe(void)
  	    xf86PciVideoInfo[num - 1] = info;
  
  	    pci_device_probe(info);
 +
-+		if (pci_device_is_boot_vga(info)) {
-+			primaryBus.type = BUS_PCI;
-+			primaryBus.id.pci = info;
-+		}
++            if (pci_device_is_boot_vga(info)) {
++                primaryBus.type = BUS_PCI;
++                primaryBus.id.pci = info;
++            }
  	    info->user_data = 0;
  	}
      }
+-- 
+1.6.3.3
+