diff --git a/radeon-fix-randr-gamma.patch b/radeon-fix-randr-gamma.patch
new file mode 100644
index 0000000..aa4dae8
--- /dev/null
+++ b/radeon-fix-randr-gamma.patch
@@ -0,0 +1,20 @@
+diff -up xf86-video-ati-6.7.196/src/radeon_driver.c.randr-gamma xf86-video-ati-6.7.196/src/radeon_driver.c
+--- xf86-video-ati-6.7.196/src/radeon_driver.c.randr-gamma	2007-11-12 11:29:55.000000000 +1000
++++ xf86-video-ati-6.7.196/src/radeon_driver.c	2007-11-29 17:30:03.000000000 +1000
+@@ -2932,10 +2932,13 @@ static void RADEONLoadPalette(ScrnInfoPt
+ 
+ 	      /* Make the change through RandR */
+ #ifdef RANDR_12_INTERFACE
+-      RRCrtcGammaSet(crtc->randr_crtc, lut_r, lut_g, lut_b);
+-#else
+-      crtc->funcs->gamma_set(crtc, lut_r, lut_g, lut_b, 256);
++      if (crtc->randr_crtc)
++          RRCrtcGammaSet(crtc->randr_crtc, lut_r, lut_g, lut_b);
++      else
+ #endif
++      {
++          crtc->funcs->gamma_set(crtc, lut_r, lut_g, lut_b, 256);
++      }
+       }
+     }
+ 
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index 78464b5..9ea4584 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.7.196
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,7 +19,7 @@ Source3:   radeon.xinf
 # Radeon patches (0-99)
 Patch2:     radeon-6.6.3-renderaccel-buglet.patch
 Patch3:     radeon-git-upstream-fixes.patch
-
+Patch4:     radeon-fix-randr-gamma.patch
 # Rage 128 patches (100-199)
 
 # mach64 patches (200-299)
@@ -43,6 +43,7 @@ X.Org X11 ati video driver.
 
 %patch2 -p1 -b .renderaccel
 %patch3 -p1 -b .fixes
+%patch4 -p1 -b .randr-gamma
 
 %build
 %configure --disable-static
@@ -83,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Nov 29 2007 Dave Airlie <airlied@redhat.com> 6.7.196-2
+- radeon-fix-randr-gamma.patch - fix access to rrcrtc if not initialised
+
 * Mon Nov 19 2007 Dave Airlie <airlied@redhat.com> 6.7.196-1
 - rebase to 6.7.196 upstream + fixes from git