diff --git a/ChangeLog b/ChangeLog
index 491bcce4b5..51b9f40d24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-08-15  Michael Natterer  <mitch@gimp.org>
+
+	* app/paint/gimppaintcore-stroke.c
+	(gimp_paint_core_stroke_boundary)
+	(gimp_paint_core_stroke_vectors): when stroking multiple segments,
+	set paint_core->cur_coords to the start of each segment. It
+	normally gets assigned by gimp_paint_core_start(), but that's not
+	called for subsequent segments. Fixes stroking multiple segments
+	with the ink tool. The other tools were not affected since they
+	plot individual brushes rather than a shape from the last to the
+	current coordinates. Spotted by Alexia.
+
 2008-08-15  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/mosaic.c: formatting.	
diff --git a/app/paint/gimppaintcore-stroke.c b/app/paint/gimppaintcore-stroke.c
index d4fb30f671..29c29ca44d 100644
--- a/app/paint/gimppaintcore-stroke.c
+++ b/app/paint/gimppaintcore-stroke.c
@@ -175,6 +175,7 @@ gimp_paint_core_stroke_boundary (GimpPaintCore     *core,
 
           initialized = TRUE;
 
+          core->cur_coords   = coords[0];
           core->start_coords = coords[0];
           core->last_coords  = coords[0];
 
@@ -277,6 +278,7 @@ gimp_paint_core_stroke_vectors (GimpPaintCore     *core,
             {
               initialized = TRUE;
 
+              core->cur_coords   = g_array_index (coords, GimpCoords, 0);
               core->start_coords = g_array_index (coords, GimpCoords, 0);
               core->last_coords  = g_array_index (coords, GimpCoords, 0);