diff --git a/ChangeLog b/ChangeLog
index ac955fb21d..e2fe28aa23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-15  Bill Skaggs  <weskaggs@primate.ucdavis.edu>
+
+	* app/paint/gimpbrushcore.c (gimp_brush_core_color_area_with_pixmap):
+	kludge to adjust offset for even-dimensioned brushes;
+	fixes bug #166622.
+
 2006-08-15  Sven Neumann  <sven@gimp.org>
 
 	* app/core/gimpviewable.h: increased GIMP_VIEWABLE_MAX_PREVIEW_SIZE
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
index 36f54ed7e8..0848820346 100644
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@@ -1344,6 +1344,8 @@ gimp_brush_core_color_area_with_pixmap (GimpBrushCore            *core,
   gint           y;
   TempBuf       *pixmap_mask;
   TempBuf       *brush_mask;
+  gdouble        X           = paint_core->cur_coords.x;
+  gdouble        Y           = paint_core->cur_coords.y;
 
   g_return_if_fail (GIMP_IS_BRUSH (core->brush));
   g_return_if_fail (core->brush->pixmap != NULL);
@@ -1370,8 +1372,16 @@ gimp_brush_core_color_area_with_pixmap (GimpBrushCore            *core,
   /*  Calculate upper left corner of brush as in
    *  gimp_paint_core_get_paint_area.  Ugly to have to do this here, too.
    */
-  ulx = (gint) floor (paint_core->cur_coords.x) - (pixmap_mask->width  >> 1);
-  uly = (gint) floor (paint_core->cur_coords.y) - (pixmap_mask->height >> 1);
+  ulx = (gint) floor (X) - (pixmap_mask->width  >> 1);
+  uly = (gint) floor (Y) - (pixmap_mask->height  >> 1);
+
+  /*  Not sure why this is necessary, but empirically the code does
+   *  not work without it for even-sided brushes.  See bug #166622.
+   */
+  if (pixmap_mask->width %2 == 0)
+    ulx += ROUND (X) - floor (X);
+  if (pixmap_mask->height %2 == 0)
+    uly += ROUND (Y) - floor (Y);
 
   offsetx = area->x - ulx;
   offsety = area->y - uly;
@@ -1466,3 +1476,4 @@ paint_line_pixmap_mask (GimpImage                *dest,
         }
     }
 }
+