diff --git a/ChangeLog b/ChangeLog
index da2f7f70c..6e38679da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-19  Carl Worth  <cworth@cworth.org>
+
+	From Bertram Felgenhauer <int-e@gmx.de>:
+
+	* test/.cvsignore:
+	* test/Makefile.am:
+	* test/rectangle-rounding-error-ref.png:
+	* test/rectangle-rounding-error.c: (draw), (main):
+	Add regression test for bug #4137 (fixed earlier).
+
 2005-08-19  Billy Biggs  <vektor@dumbterm.net>
 
 	* test/pixman-rotate.c: No need to include cairo-pdf.h.
diff --git a/test/.cvsignore b/test/.cvsignore
index 44d50c1ed..541b1b522 100644
--- a/test/.cvsignore
+++ b/test/.cvsignore
@@ -40,6 +40,7 @@ pdf-surface.pdf
 ps-surface
 ps-surface.ps
 pixman-rotate
+rectangle-rounding-error
 rel-path
 scale-source-surface-paint
 select-font-no-show-text
diff --git a/test/Makefile.am b/test/Makefile.am
index 9e398de44..92c4949b1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -29,6 +29,7 @@ paint				\
 paint-with-alpha		\
 path-data			\
 pixman-rotate			\
+rectangle-rounding-error	\
 scale-source-surface-paint	\
 select-font-no-show-text	\
 self-copy			\
@@ -100,6 +101,7 @@ paint-ref.png				\
 paint-with-alpha-ref.png		\
 path-data-ref.png			\
 pixman-rotate-ref.png			\
+rectangle-rounding-error.png		\
 romedalen.png				\
 self-copy-ref.png			\
 self-intersecting-ref.png		\
@@ -209,6 +211,7 @@ pdf_surface_LDADD = $(LDADDS)
 pdf_clip_LDADD = $(LDADDS)
 ps_surface_LDADD = $(LDADDS)
 pixman_rotate_LDADD = $(LDADDS)
+rectangle_rounding_error_LDADD = $(LDADDS)
 scale_source_surface_paint_LDADD = $(LDADDS)
 select_font_no_show_text_LDADD = $(LDADDS)
 self_copy_LDADD = $(LDADDS)
diff --git a/test/rectangle-rounding-error-ref.png b/test/rectangle-rounding-error-ref.png
new file mode 100644
index 000000000..c3a6840c0
Binary files /dev/null and b/test/rectangle-rounding-error-ref.png differ
diff --git a/test/rectangle-rounding-error.c b/test/rectangle-rounding-error.c
new file mode 100644
index 000000000..6ec6cf43e
--- /dev/null
+++ b/test/rectangle-rounding-error.c
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2005 Bertram Felgenhauer
+ *
+ * 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
+ * the author not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. The author makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE AUTHOR. 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: Bertram Felgenhauer <int-e@gmx.de>
+ */
+
+#include "cairo-test.h"
+
+/* Test case for:                                                               
+ *                                                                              
+ *      https://bugs.freedesktop.org/show_bug.cgi?id=4137                       
+ */                                                                             
+
+cairo_test_t test = {
+    "rectangle-rounding-error",
+    "This demonstrates (or not) a rounding error that causes a gap between "
+    "two neighbouring rectangles.",
+    76, 76
+};
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+    cairo_set_source_rgb (cr, 0, 0, 0);
+
+    cairo_translate(cr, -300, -300);
+    cairo_scale(cr, 677.0/26, 677.0/26);
+    cairo_translate(cr, 1, 1);
+    
+    /* this should draw a seamless 2x2 rectangle */
+    cairo_rectangle(cr, 11, 11, 1, 1);
+    cairo_rectangle(cr, 11, 12, 1, 1);
+    cairo_rectangle(cr, 12, 11, 1, 1);
+    cairo_rectangle(cr, 12, 12, 1, 1);
+
+    cairo_set_source_rgb(cr, 0, 0, 0);
+    cairo_fill(cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test, draw);
+}