diff --git a/ChangeLog b/ChangeLog
index 64e6c69ec..fc1fd3f72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-15  Carl Worth  <cworth@east.isi.edu>
+
+	* configure.in: Require xrender >= 0.6.0
+
+	* src/cairo_surface.c (_cairo_x11_surface_put_image): Make static.
+
 2003-09-15  Carl Worth  <cworth@isi.edu>
 
 	* src/cairo.c (cairo_restore): Fix to catch invalid restore rather
diff --git a/configure.in b/configure.in
index 7914e5f2e..940c21965 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,7 @@ AC_PATH_XTRA
 
 dnl ===========================================================================
 
-PKG_CHECK_MODULES(CAIRO, slim >= 0.2.0 libic >= 0.1.1 xft)
+PKG_CHECK_MODULES(CAIRO, slim >= 0.2.0 libic >= 0.1.1 xft xrender >= 0.6)
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
 
diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index e72c9002c..80176b9af 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -355,12 +355,12 @@ _cairo_surface_ensure_gc (cairo_surface_t *surface)
     surface->gc = XCreateGC (surface->dpy, surface->drawable, 0, NULL);
 }
 
-cairo_status_t
-cairo_x11_surface_put_image (cairo_surface_t       *surface,
-                        char                   *data,
-                        int                    width,
-                        int                    height,
-                        int                    stride)
+static cairo_status_t
+_cairo_x11_surface_put_image (cairo_surface_t       *surface,
+			      char                   *data,
+			      int                    width,
+			      int                    height,
+			      int                    stride)
 {
     if (surface->picture) {
 	XImage *image;
@@ -629,11 +629,11 @@ _cairo_surface_composite (cairo_operator_t	operator,
 	    cairo_surface_get_matrix (src, &matrix);
 	    cairo_surface_set_matrix (src_on_server, &matrix);
 
-	    cairo_x11_surface_put_image (src_on_server,
-					 (char *) IcImageGetData (src->icimage),
-					 IcImageGetWidth (src->icimage),
-					 IcImageGetHeight (src->icimage),
-					 IcImageGetStride (src->icimage));
+	    _cairo_x11_surface_put_image (src_on_server,
+					  (char *) IcImageGetData (src->icimage),
+					  IcImageGetWidth (src->icimage),
+					  IcImageGetHeight (src->icimage),
+					  IcImageGetStride (src->icimage));
 	}
 
 	XRenderComposite (dst->dpy, operator,
diff --git a/src/cairo_surface.c b/src/cairo_surface.c
index e72c9002c..80176b9af 100644
--- a/src/cairo_surface.c
+++ b/src/cairo_surface.c
@@ -355,12 +355,12 @@ _cairo_surface_ensure_gc (cairo_surface_t *surface)
     surface->gc = XCreateGC (surface->dpy, surface->drawable, 0, NULL);
 }
 
-cairo_status_t
-cairo_x11_surface_put_image (cairo_surface_t       *surface,
-                        char                   *data,
-                        int                    width,
-                        int                    height,
-                        int                    stride)
+static cairo_status_t
+_cairo_x11_surface_put_image (cairo_surface_t       *surface,
+			      char                   *data,
+			      int                    width,
+			      int                    height,
+			      int                    stride)
 {
     if (surface->picture) {
 	XImage *image;
@@ -629,11 +629,11 @@ _cairo_surface_composite (cairo_operator_t	operator,
 	    cairo_surface_get_matrix (src, &matrix);
 	    cairo_surface_set_matrix (src_on_server, &matrix);
 
-	    cairo_x11_surface_put_image (src_on_server,
-					 (char *) IcImageGetData (src->icimage),
-					 IcImageGetWidth (src->icimage),
-					 IcImageGetHeight (src->icimage),
-					 IcImageGetStride (src->icimage));
+	    _cairo_x11_surface_put_image (src_on_server,
+					  (char *) IcImageGetData (src->icimage),
+					  IcImageGetWidth (src->icimage),
+					  IcImageGetHeight (src->icimage),
+					  IcImageGetStride (src->icimage));
 	}
 
 	XRenderComposite (dst->dpy, operator,