diff --git a/ChangeLog b/ChangeLog
index 1f49c21..073e26d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-16  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/cairo/CairoContext.m: Switch to XGCairoSurface by default,
+	because it fixes the corrupted display problem reported by Riccardo
+	on 16-bit displays.
+
 2011-09-12 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/cairo/CairoGState.m (-saveClip, -restoreClip:,
diff --git a/Source/cairo/CairoContext.m b/Source/cairo/CairoContext.m
index 3853db1..3bb8088 100644
--- a/Source/cairo/CairoContext.m
+++ b/Source/cairo/CairoContext.m
@@ -45,10 +45,10 @@
 #    define _CAIRO_SURFACE_CLASSNAME XGCairoGlitzSurface
 #    include "cairo/XGCairoGlitzSurface.h"
 #  else
-//#    define _CAIRO_SURFACE_CLASSNAME XGCairoSurface
-//#    include "cairo/XGCairoSurface.h"
-#    define _CAIRO_SURFACE_CLASSNAME XGCairoXImageSurface
-#    include "cairo/XGCairoXImageSurface.h"
+#    define _CAIRO_SURFACE_CLASSNAME XGCairoSurface
+#    include "cairo/XGCairoSurface.h"
+//#    define _CAIRO_SURFACE_CLASSNAME XGCairoXImageSurface
+//#    include "cairo/XGCairoXImageSurface.h"
 #  endif /* USE_GLITZ */
 #  include "x11/XGServerWindow.h"
 #  include "x11/XWindowBuffer.h"