diff --git a/ChangeLog b/ChangeLog
index a470ee8380..e02fad2e5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-22  Michael Natterer  <mitch@gimp.org>
+
+	* app/tools/gimpclonetool.c (gimp_clone_tool_draw): chain up
+	unconditionally now that we draw the brush outline while
+	painting. Fixes brush outline artefacts on button_press and
+	button_release. Spotted by sjburges.
+
 2004-06-22  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimpfiledialog.c (gimp_file_dialog_set_image): unset
diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c
index 77afa1337f..bd365dd57d 100644
--- a/app/tools/gimpclonetool.c
+++ b/app/tools/gimpclonetool.c
@@ -249,10 +249,8 @@ gimp_clone_tool_draw (GimpDrawTool *draw_tool)
             }
         }
     }
-  else
-    {
-      GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
-    }
+
+  GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
 }
 
 
@@ -261,12 +259,10 @@ gimp_clone_tool_draw (GimpDrawTool *draw_tool)
 static GtkWidget *
 gimp_clone_options_gui (GimpToolOptions *tool_options)
 {
-  GObject   *config;
+  GObject   *config = G_OBJECT (tool_options);
   GtkWidget *vbox;
   GtkWidget *frame;
 
-  config = G_OBJECT (tool_options);
-
   vbox = gimp_paint_options_gui (tool_options);
 
   frame = gimp_prop_enum_radio_frame_new (config, "clone-type",
diff --git a/app/tools/gimpsourcetool.c b/app/tools/gimpsourcetool.c
index 77afa1337f..bd365dd57d 100644
--- a/app/tools/gimpsourcetool.c
+++ b/app/tools/gimpsourcetool.c
@@ -249,10 +249,8 @@ gimp_clone_tool_draw (GimpDrawTool *draw_tool)
             }
         }
     }
-  else
-    {
-      GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
-    }
+
+  GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
 }
 
 
@@ -261,12 +259,10 @@ gimp_clone_tool_draw (GimpDrawTool *draw_tool)
 static GtkWidget *
 gimp_clone_options_gui (GimpToolOptions *tool_options)
 {
-  GObject   *config;
+  GObject   *config = G_OBJECT (tool_options);
   GtkWidget *vbox;
   GtkWidget *frame;
 
-  config = G_OBJECT (tool_options);
-
   vbox = gimp_paint_options_gui (tool_options);
 
   frame = gimp_prop_enum_radio_frame_new (config, "clone-type",