diff --git a/ChangeLog b/ChangeLog
index eee3c31a4..057bef7ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-28  Owen Taylor  <otaylor@redhat.com>
+
+	* src/cairo-xlib-surface.c (_cairo_xlib_surface_create_internal): Also
+	flag older XFree86 servers as buggy-repeat.
+
 2005-06-28  T Rowley  <tim.rowley@gmail.com>
 
 	* src/cairo-atsui-font.c (_cairo_atsui_font_text_to_glyphs):
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index ec02a290d..f10dcfc57 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -1355,6 +1355,9 @@ _cairo_xlib_surface_create_internal (Display		       *dpy,
     if (strcmp (ServerVendor (dpy), "The X.Org Foundation") == 0) {
 	if (VendorRelease (dpy) <= 60802000)
 	    surface->buggy_repeat = TRUE;
+    } else if (strcmp (ServerVendor (dpy), "The XFree86 Project, Inc") == 0) {
+	if (VendorRelease (dpy) <= 40400000)
+	    surface->buggy_repeat = TRUE;
     }
 
     surface->dst_picture = None;