diff --git a/radeon-r600-gart-table.patch b/radeon-r600-gart-table.patch
new file mode 100644
index 0000000..889a2d0
--- /dev/null
+++ b/radeon-r600-gart-table.patch
@@ -0,0 +1,30 @@
+From ef69336584c45e35aabb797a06c4030e75d66507 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Thu, 12 Mar 2009 14:54:18 +1000
+Subject: [PATCH] r600: fix sizing of PCI GART table for r600
+
+---
+ src/radeon_dri.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/radeon_dri.c b/src/radeon_dri.c
+index 2b7540c..1bfb896 100644
+--- a/src/radeon_dri.c
++++ b/src/radeon_dri.c
+@@ -2327,8 +2327,11 @@ int RADEONDRIGetPciAperTableSize(ScrnInfoPtr pScrn)
+     int num_pages;
+ 
+     num_pages = (info->dri->pciAperSize * 1024 * 1024) / 4096;
+-    
+-    ret_size = num_pages * sizeof(unsigned int);
++
++    if (info->ChipFamily < CHIP_FAMILY_R600)
++        ret_size = num_pages * sizeof(unsigned int);
++    else
++        ret_size = num_pages * sizeof(uint64_t);
+ 
+     return ret_size;
+ }
+-- 
+1.6.0.6
+
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index 5aa1a82..0bc27a8 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.11.0
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,6 +20,7 @@ Patch1:     radeon-modeset.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-fix-r600-xv.patch
+Patch8:	    radeon-r600-gart-table.patch
 
 ExcludeArch: s390 s390x
 
@@ -47,6 +48,7 @@ X.Org X11 ati video driver.
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600xv
+%patch8 -p1 -b .r600gart
 
 %build
 autoreconf -iv
@@ -78,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Mar 12 2009 Dave Airlie <airlied@redhat.com> 6.11.0-8
+- fix r600 GART table sizing bug
+
 * Tue Mar 10 2009 Dave Airlie <airlied@redhat.com> 6.11.0-7
 - fix r600 xv, thanks to twoerner on #radeon for testing