diff --git a/ChangeLog b/ChangeLog
index fb8b943894..0745957126 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-10  Philip Lafleur  <plafleur@cvs.gnome.org>
+
+	* app/gui/preferences-dialog.c: restored the 'Show Paint Tool
+    Cursor' option that was removed during clean-up.
+
 2004-06-10  Philip Lafleur  <plafleur@cvs.gnome.org>
 
 	* app/paint/gimpbrushcore.c (gimp_brush_core_pressurize_mask):
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 5a71a3220e..9e86805a1e 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1460,7 +1460,10 @@ prefs_dialog_new (Gimp       *gimp,
   prefs_check_button_add (object, "show-brush-outline",
                           _("Show _Brush Outline"),
                           GTK_BOX (vbox2));
-
+  prefs_check_button_add (object, "show-paint-tool-cursor", 	 
+                          _("Show Paint _Tool Cursor"), 	 
+                          GTK_BOX (vbox2));
+   
   table = prefs_table_new (1, GTK_CONTAINER (vbox2));
 
   prefs_enum_combo_box_add (object, "cursor-mode", 0, 0,
diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c
index 5a71a3220e..9e86805a1e 100644
--- a/app/gui/preferences-dialog.c
+++ b/app/gui/preferences-dialog.c
@@ -1460,7 +1460,10 @@ prefs_dialog_new (Gimp       *gimp,
   prefs_check_button_add (object, "show-brush-outline",
                           _("Show _Brush Outline"),
                           GTK_BOX (vbox2));
-
+  prefs_check_button_add (object, "show-paint-tool-cursor", 	 
+                          _("Show Paint _Tool Cursor"), 	 
+                          GTK_BOX (vbox2));
+   
   table = prefs_table_new (1, GTK_CONTAINER (vbox2));
 
   prefs_enum_combo_box_add (object, "cursor-mode", 0, 0,