diff --git a/ChangeLog b/ChangeLog
index d86020596..b30a63f20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-21  Kristian Høgsberg  <krh@redhat.com>
+
+	* src/cairo-surface.c (_cairo_surface_set_clip_region): Handle
+	backends that don't have a set_clip_region implementation (PDF).
+
 2005-04-19  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo.c: (cairo_paint):
diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index c87c3a747..9a22b1292 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -864,6 +864,9 @@ _cairo_surface_set_clip_region (cairo_surface_t   *surface,
     if (surface->finished)
 	return CAIRO_STATUS_SURFACE_FINISHED;
 
+    if (surface->backend->set_clip_region == NULL)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
     if (region) {
 	box = pixman_region_extents (region);