diff --git a/radeon-r6xx-fix.patch b/radeon-r6xx-fix.patch
index 9c682b2..765353f 100644
--- a/radeon-r6xx-fix.patch
+++ b/radeon-r6xx-fix.patch
@@ -39,13 +39,13 @@ index 1ef8dc3..0410dd2 100644
  		if (id == FOURCC_YV12)
  		    R600CopyPlanarHW(pScrn, buf, buf + s3offset, buf + s2offset,
 -				     pPriv->src_offset,
-+				     pPriv->src_offset + info->fbLocation + pScrn->fboffset,
++				     pPriv->src_offset + info->fbLocation + pScrn->fbOffset,
  				     srcPitch, srcPitch2, pPriv->src_pitch,
  				     width, height);
  		else
  		    R600CopyPlanarHW(pScrn, buf, buf + s2offset, buf + s3offset,
 -				     pPriv->src_offset,
-+				     pPriv->src_offset + info->fbLocation + pScrn->fboffset,
++				     pPriv->src_offset + info->fbLocation + pScrn->fbOffset,
  				     srcPitch, srcPitch2, pPriv->src_pitch,
  				     width, height);
  	    } else {
@@ -54,7 +54,7 @@ index 1ef8dc3..0410dd2 100644
  	if (info->ChipFamily >= CHIP_FAMILY_R600) {
  	    if (info->DMAForXv)
 -		R600CopyPackedHW(pScrn, buf, pPriv->src_offset,
-+		R600CopyPackedHW(pScrn, buf, pPriv->src_offset + info->fbLocation + pScrn->fboffset,
++		R600CopyPackedHW(pScrn, buf, pPriv->src_offset + info->fbLocation + pScrn->fbOffset,
  				 2 * width, pPriv->src_pitch,
  				 width, height);
  	    else
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index 41a711f..8ff55bb 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.12.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Apr 03 2009 Dave Airlie <airlied@redhat.com> 6.12.1-4
+- fix up r600 xv harder
+
 * Fri Apr 03 2009 Dave Airlie <airlied@redhat.com> 6.12.1-3
 - fix up r600 xv src offsets hopefully