diff --git a/ChangeLog b/ChangeLog
index d03cffe923..691d51e1f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-15  Sven Neumann  <sven@gimp.org>
+
+	* app/tools/gimpcurvestool.c: fixed position of vertical line
+	indicating the picked color. Patch from William Skaggs and
+	Søren Wedel Nielsen; fixes bug #142506.
+
 2004-05-15  Michael Natterer  <mitch@gimp.org>
 
 	* app/plug-in/plug-in-params.c (plug_in_proc_args_check): changed
diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c
index c33787e37c..cb101a17cf 100644
--- a/app/tools/gimpcurvestool.c
+++ b/app/tools/gimpcurvestool.c
@@ -1225,9 +1225,11 @@ curves_graph_expose (GtkWidget      *widget,
       /* draw the color line */
       gdk_draw_line (widget->window,
                      graph_gc,
-                     tool->col_value[channel] + RADIUS,
+                     RADIUS +
+                     ROUND ((gdouble) width  * (tool->col_value[channel]) / 256.0),
                      RADIUS,
-                     tool->col_value[channel] + RADIUS,
+                     RADIUS +
+                     ROUND ((gdouble) width  * (tool->col_value[channel]) / 256.0),
                      height + RADIUS - 1);
 
       /* and xpos indicator */
@@ -1248,7 +1250,8 @@ curves_graph_expose (GtkWidget      *widget,
 
       gdk_draw_layout (widget->window,
                        graph_gc,
-                       tool->col_value[channel] + x,
+                       RADIUS +
+                       ROUND (((gdouble) width  * (tool->col_value[channel])) / 256.0 + x),
                        height - y - 2,
                        tool->xpos_layout);
     }