diff --git a/ChangeLog b/ChangeLog
index 447318a2cf..69bce9d2de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 12 19:16:58 1999 Adrian Likins <alikins@redhat.com>
+
+	* app/pixmapbrush.c: added a fix from Xach "I dont code."
+	Beane <xach@gimp.org> to fix the behaviour when painting
+	at the top of images.
+
 Thu Aug 12 23:15:53 BST 1999 Andy Thomas <alt@gimp.org>
 
 	* app/commands.c
diff --git a/app/pixmapbrush.c b/app/pixmapbrush.c
index 0a36e31bf7..cd6ac555ae 100644
--- a/app/pixmapbrush.c
+++ b/app/pixmapbrush.c
@@ -269,6 +269,12 @@ pixmapbrush_motion (PaintCore *paint_core,
   else
     offset_x = 0;
 
+  if (area->y == 0)
+    offset_y = brush->pixmap_mask->height - destPR.h;
+  else
+    offset_y = 0;
+
+
   /* FIXME handle the top of the image properly */
   
   for (; pr != NULL; pr = pixel_regions_process (pr))
@@ -335,7 +341,7 @@ paint_line_pixmap_mask (GImage        *dest,
   /* point to the approriate scanline */
   /* use "pat" here because i'm c&p from pattern clone */
   pat = temp_buf_data (brush->pixmap_mask) +
-    (y * brush->pixmap_mask->width * brush->pixmap_mask->bytes);
+    (( y + offset_y ) * brush->pixmap_mask->width * brush->pixmap_mask->bytes);
 
     
   /*   dest = d +  (y * brush->pixmap_mask->width * brush->pixmap_mask->bytes); */