diff --git a/ChangeLog b/ChangeLog
index 87fff08..a6997aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-09-03 Nicolas Roard <nicolas@roard.com>
+
+	* configure:
+	* configure.ac: check that Xrender lib is present and add it to the
+	link process. Only use Xrender for Cairo.
+	* Source/cairo/XGCairoXImageSurface.m: use 32 bits surfaces when
+	available, else stay with 24bits surface.
+	* Source/cairo/CairoGState.m: some cleaning, and fixed the scrolling
+	bug. 
+
 2007-09-02 Nicolas Roard <nicolas@roard.com>
 
 	* configure:
diff --git a/Source/cairo/CairoGState.m b/Source/cairo/CairoGState.m
index 8ef6a0a..aada126 100644
--- a/Source/cairo/CairoGState.m
+++ b/Source/cairo/CairoGState.m
@@ -1106,6 +1106,11 @@ _set_op(cairo_t *ct, NSCompositingOperation op)
 
   cairo_new_path(_ct);
   _set_op(_ct, op);
+  
+  if (viewIsFlipped && !copyOnSelf)
+    {
+      aPoint.y -= aRect.size.height;
+    }
 
   {
       NSRect newRect;