diff --git a/ChangeLog b/ChangeLog
index 6a5db32bc..6b330bc24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-19 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSThemeTools.m: Fix broken drawing due to error in
+	the ([-validateTilesSizeWithImage:]) method.
+
 2009-10-19 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSThemeTools.m: Fix last changes to compile again (variable
diff --git a/Source/GSThemeTools.m b/Source/GSThemeTools.m
index b65797215..d0e439ed1 100644
--- a/Source/GSThemeTools.m
+++ b/Source/GSThemeTools.m
@@ -883,8 +883,11 @@ withRepeatedImage: (NSImage*)image
         }
       else
         {
+          images[i] = RETAIN(image);
+/* This breaks drawing at present.
           images[i]
 	    = [[self extractImageFrom: image withRect: rects[i]] retain];
+*/
         }
     }
 }
@@ -1080,6 +1083,9 @@ withRepeatedImage: (NSImage*)image
     rect.size.width - cls.width - crs.width,
     rect.size.height - bms.height - tms.height);
 
+  [self repeatFillRect: rect];
+  [self drawCornersRect: rect];
+
   [[GSTheme theme] fillRect: inFill
     withRepeatedImage: images[TileCM]
     fromRect: rects[TileCM]