diff --git a/ChangeLog b/ChangeLog
index 6f63d3d3c..9be8d41ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-11  Carl Worth  <cworth@cworth.org>
+
+	* test/.cvsignore:
+	* test/Makefile.am:
+	* test/translate-show-surface-ref.png:
+	* test/translate-show-surface.c: (draw), (main): Add new test
+	demonstrating bug in the sequence: cairo_translate;
+	cairo_show_surface.
+
 2005-04-11  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo.c (cairo_select_font_face): Add deprecation alias from
diff --git a/test/.cvsignore b/test/.cvsignore
index 6df57ab06..7a0f8796b 100644
--- a/test/.cvsignore
+++ b/test/.cvsignore
@@ -17,6 +17,7 @@ pixman-rotate
 text-cache-crash
 text-rotate
 transforms
+translate-show-surface
 user-data
 *-out.png
 *-diff.png
diff --git a/test/Makefile.am b/test/Makefile.am
index 29033540e..3e5a86b0e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -14,6 +14,7 @@ pixman-rotate		\
 text-cache-crash	\
 text-rotate		\
 transforms		\
+translate-show-surface	\
 user-data
 
 # And all new tests go here too. I really don't like having to repeat
@@ -31,7 +32,8 @@ clip-twice-ref.png		\
 path-data-ref.png		\
 pixman-rotate-ref.png		\
 romedalen.png			\
-transforms-ref.png
+transforms-ref.png		\
+translate-show-surface-ref.png
 
 # Once we can draw the text-rotate.c test case correctly, we should
 # create and add text-rotate-ref.png to the list of reference PNGs.
@@ -89,6 +91,7 @@ pixman_rotate_LDADD = $(LDADDS)
 text_cache_crash_LDADD = $(LDADDS)
 text_rotate_LDADD = $(LDADDS)
 transforms_LDADD = $(LDADDS)
+translate_show_surface_LDADD = $(LDADDS)
 user_data_LDADD = $(LDADDS)
 
 noinst_PROGRAMS = imagediff
diff --git a/test/translate-show-surface-ref.png b/test/translate-show-surface-ref.png
new file mode 100644
index 000000000..765adc4a4
Binary files /dev/null and b/test/translate-show-surface-ref.png differ
diff --git a/test/translate-show-surface.c b/test/translate-show-surface.c
new file mode 100644
index 000000000..0e6ac359a
--- /dev/null
+++ b/test/translate-show-surface.c
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Red Hat, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Red Hat, Inc. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Carl D. Worth <cworth@cworth.org>
+ */
+
+/* Bug history
+ *
+ * 2005-04-11 Carl Worth <cworth@cworth.org>
+ *
+ *   It appears that calling cairo_show_surface after cairo_translate
+ *   somehow applies the translation twice to the surface being
+ *   shown. This is pretty easy to demonstrate by bringing up xsvg on
+ *   an SVG file with an <image> and panning around a bit with the
+ *   arrow keys.
+ *
+ *   This is almost certainly a regression, and I suspect there may be
+ *   some interaction with the fix for move-to-show-surface.
+ */
+
+#include "cairo-test.h"
+
+cairo_test_t test = {
+    "translate-show-surface",
+    "Tests calls to cairo_show_surface after cairo_translate",
+    2, 2
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_surface_t *surface;
+    unsigned long colors[4] = {
+	0xffffffff, 0xffff0000,
+	0xff00ff00, 0xff0000ff
+    };
+    int i;
+
+    for (i=0; i < 4; i++) {
+	surface = cairo_surface_create_for_image ((unsigned char *) &colors[i],
+						  CAIRO_FORMAT_ARGB32, 1, 1, 4);
+	cairo_save (cr);
+	{
+	    cairo_translate (cr, i % 2, i / 2);
+	    cairo_show_surface (cr, surface, 1, 1);
+	}
+	cairo_restore (cr);
+	cairo_surface_destroy (surface);
+    }
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test, draw);
+}