diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index 4d65ee6d2..491859f74 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -1003,7 +1003,7 @@ static struct {
 static int n_cached;
 
 void
-_cairo_image_reset_static_data ()
+_cairo_image_reset_static_data (void)
 {
     while (n_cached)
 	pixman_image_unref (cache[--n_cached].image);
@@ -3447,10 +3447,15 @@ _composite_spans (void                          *closure,
     /* TODO: support rendering to A1 surfaces (or: go add span
      * compositing to pixman.) */
 
-    if (pattern == NULL && dst_format == PIXMAN_a8) {
+    if (pattern == NULL &&
+	dst_format == PIXMAN_a8 &&
+	op == CAIRO_OPERATOR_SOURCE)
+    {
 	mask = dst;
 	dst = NULL;
-    } else {
+    }
+    else
+    {
 	int stride = CAIRO_STRIDE_FOR_WIDTH_BPP (extents->width, 8);
 	uint8_t *data = mask_buf;
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 53b03c722..a3c1f7a40 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -138,6 +138,7 @@ REFERENCE_IMAGES = \
 	a1-rasterisation-triangles.ref.png \
 	a1-traps-sample.ref.png \
 	a1-traps-sample.quartz.xfail.png \
+	a8-clear.ref.png \
 	a8-mask.ref.png \
 	aliasing.ref.png \
 	aliasing.image16.ref.png \
diff --git a/test/Makefile.sources b/test/Makefile.sources
index e497cd745..a13aea82c 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -5,6 +5,7 @@ test_sources = \
 	a1-mask-sample.c 				\
 	a1-traps-sample.c				\
 	a1-rasterisation.c				\
+	a8-clear.c					\
 	a8-mask.c					\
 	aliasing.c					\
 	alpha-similar.c					\
diff --git a/test/a8-clear.c b/test/a8-clear.c
new file mode 100644
index 000000000..1459f833e
--- /dev/null
+++ b/test/a8-clear.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2010 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Chris Wilson <chris@chris-wilson.co.uk>
+ *
+ * Based on a bug snippet by Jeremy Moles <jeremy@emperorlinux.com>
+ */
+
+#include "cairo-test.h"
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_pattern_t *mask;
+
+    cairo_set_source_rgb (cr, 1, 0, 0);
+    cairo_paint (cr);
+
+    cairo_push_group_with_content (cr, CAIRO_CONTENT_ALPHA);
+    {
+	cairo_set_source_rgb (cr, 1, 1, 1);
+	cairo_paint (cr);
+
+	cairo_move_to (cr, 0, 0);
+	cairo_line_to (cr, width, height);
+	cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+	cairo_set_line_width (cr, 10);
+	cairo_stroke (cr);
+    }
+    mask = cairo_pop_group (cr);
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_mask (cr, mask);
+    cairo_pattern_destroy (mask);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (a8_clear,
+	    "Test clear on an a8 surface",
+	    "a8, clear", /* keywords */
+	    NULL, /* requirements */
+	    40, 40,
+	    NULL, draw)
+
diff --git a/test/a8-clear.ref.png b/test/a8-clear.ref.png
new file mode 100644
index 000000000..98a624eba
Binary files /dev/null and b/test/a8-clear.ref.png differ