diff --git a/xserver-1.7.1-window-pictures.patch b/xserver-1.7.1-window-pictures.patch
index e3d8c51..5246bfb 100644
--- a/xserver-1.7.1-window-pictures.patch
+++ b/xserver-1.7.1-window-pictures.patch
@@ -1,14 +1,14 @@
-From 9baca08d9f0b1e2902d39fd98805a4c37cb4eab6 Mon Sep 17 00:00:00 2001
-From: Søren Sandmann Pedersen <sandmann@redhat.com>
+From 154b717f261a37af95f09e6645db0ceeb6b22d6a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann@redhat.com>
 Date: Wed, 28 Oct 2009 02:54:03 -0400
 Subject: [PATCH] fix Render with window sources
 
 ---
- fb/fbpict.c |   78 +++++++++++++++++++++++++---------------------------------
- 1 files changed, 34 insertions(+), 44 deletions(-)
+ fb/fbpict.c |   74 +++++++++++++++++++++++++---------------------------------
+ 1 files changed, 32 insertions(+), 42 deletions(-)
 
 diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 2fbef15..2d91f2f 100644
+index 2fbef15..08bb537 100644
 --- a/fb/fbpict.c
 +++ b/fb/fbpict.c
 @@ -268,54 +268,41 @@ create_conical_gradient_image (PictGradient *gradient)
@@ -47,19 +47,19 @@ index 2fbef15..2d91f2f 100644
 +    if (!image)
  	return NULL;
 -    }
-     
+-    
 -    /* First fill the pixmap with zeros */
 -    gcv[0].val = 0x00000000;
 -    gcv[1].val = IncludeInferiors;
 -    dixChangeGC (NullClient, pGC, GCBackground | GCSubwindowMode, NULL, gcv);
 -    ValidateGC ((DrawablePtr)pPixmap, pGC);
 -    miClearDrawable ((DrawablePtr)pPixmap, pGC);
-+    bits = pixman_image_get_data (image);
      
 -    /* Then copy the window there */
 -    ValidateGC(&pPixmap->drawable, pGC);
 -    (* pGC->ops->CopyArea) (pDraw, &pPixmap->drawable, pGC, 0, 0, width, height, 0, 0);
--    
++    bits = pixman_image_get_data (image);
+     
 -    FreeScratchGC (pGC);
 -    
 -    return &pPixmap->drawable;
@@ -98,22 +98,20 @@ index 2fbef15..2d91f2f 100644
  	drawable = pict->pDrawable;
 -    
 -    fbGetDrawable (drawable, bits, stride, bpp, xoff, yoff);
--
+ 
 -    bits = (FbBits*)((CARD8*)bits +
 -		     (drawable->y + yoff) * stride * sizeof(FbBits) +
 -		     (drawable->x + xoff) * (bpp / 8));
--
++	fbGetDrawable (drawable, bits, stride, bpp, xoff, yoff);
+ 
 -    image = pixman_image_create_bits (
 -	pict->format, drawable->width, drawable->height,
 -	(uint32_t *)bits, stride * sizeof (FbStride));
 -    
-+	
-+	fbGetDrawable (drawable, bits, stride, bpp, xoff, yoff);
-+	
 +	bits = (FbBits*)((CARD8*)bits +
 +			 (drawable->y + yoff) * stride * sizeof(FbBits) +
 +			 (drawable->x + xoff) * (bpp / 8));
-+	
++
 +	image = pixman_image_create_bits (
 +	    pict->format, drawable->width, drawable->height,
 +	    (uint32_t *)bits, stride * sizeof (FbStride));
@@ -122,5 +120,5 @@ index 2fbef15..2d91f2f 100644
  #ifdef FB_ACCESS_WRAPPER
  #if FB_SHIFT==5
 -- 
-1.6.5.1
+1.6.4.4