diff --git a/ChangeLog b/ChangeLog
index c1661b8d2d..158aa89820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-04  Sven Neumann  <sven@gimp.org>
+
+	* app/tools/gimpclonetool.c (gimp_clone_tool_oper_update): check
+	for options->clone_type.
+
 2005-04-04  Sven Neumann  <sven@gimp.org>
 
 	* app/tools/gimppainttool.[ch] export paint tool statusbar API.
diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c
index 2a12ad6993..829c4334ea 100644
--- a/app/tools/gimpclonetool.c
+++ b/app/tools/gimpclonetool.c
@@ -246,11 +246,16 @@ gimp_clone_tool_oper_update (GimpTool        *tool,
                              GdkModifierType  state,
                              GimpDisplay     *gdisp)
 {
+  GimpToolOptions *options = tool->tool_info->tool_options;
+
   GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
 
-  if (! GIMP_CLONE (GIMP_PAINT_TOOL (tool)->core)->src_drawable)
-    gimp_paint_tool_replace_status (tool, gdisp,
-                                    _("Ctrl-Click to set a clone source."));
+  if (GIMP_CLONE_OPTIONS (options)->clone_type == GIMP_IMAGE_CLONE &&
+      GIMP_CLONE (GIMP_PAINT_TOOL (tool)->core)->src_drawable == NULL)
+    {
+      gimp_paint_tool_replace_status (tool, gdisp,
+                                      _("Ctrl-Click to set a clone source."));
+    }
 }
 
 static void
diff --git a/app/tools/gimpsourcetool.c b/app/tools/gimpsourcetool.c
index 2a12ad6993..829c4334ea 100644
--- a/app/tools/gimpsourcetool.c
+++ b/app/tools/gimpsourcetool.c
@@ -246,11 +246,16 @@ gimp_clone_tool_oper_update (GimpTool        *tool,
                              GdkModifierType  state,
                              GimpDisplay     *gdisp)
 {
+  GimpToolOptions *options = tool->tool_info->tool_options;
+
   GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, gdisp);
 
-  if (! GIMP_CLONE (GIMP_PAINT_TOOL (tool)->core)->src_drawable)
-    gimp_paint_tool_replace_status (tool, gdisp,
-                                    _("Ctrl-Click to set a clone source."));
+  if (GIMP_CLONE_OPTIONS (options)->clone_type == GIMP_IMAGE_CLONE &&
+      GIMP_CLONE (GIMP_PAINT_TOOL (tool)->core)->src_drawable == NULL)
+    {
+      gimp_paint_tool_replace_status (tool, gdisp,
+                                      _("Ctrl-Click to set a clone source."));
+    }
 }
 
 static void