diff --git a/ChangeLog b/ChangeLog
index 745e98dacd..72a952372f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-09-02  Tor Lillqvist  <tml@iki.fi>
 
+	* app/paintbrush.c (paintbrush_non_gui_default,
+	paintbrush_non_gui): Make also the non-gui paintbrush (called when
+	stroking a path) handle changing brushes, i.e. pixmap brush pipes.
+
 	* libgimp/parasiteio.[ch]: New files. Types and functions related
 	to "standard" parasite types. Used for the
 	gimp-brush-pipe-parameters parasite that the gpb and psp plug-ins
diff --git a/app/paintbrush.c b/app/paintbrush.c
index 8346061d82..b9b02b5173 100644
--- a/app/paintbrush.c
+++ b/app/paintbrush.c
@@ -517,6 +517,8 @@ paintbrush_non_gui_default (GimpDrawable *drawable,
       non_gui_paint_core.startx = non_gui_paint_core.lastx = stroke_array[0];
       non_gui_paint_core.starty = non_gui_paint_core.lasty = stroke_array[1];
 
+      non_gui_paint_core.flags |= TOOL_CAN_HANDLE_CHANGING_BRUSH;
+
       paintbrush_non_gui_paint_func (&non_gui_paint_core, drawable, 0);
 
       for (i = 1; i < num_strokes; i++)
@@ -566,6 +568,8 @@ paintbrush_non_gui (GimpDrawable *drawable,
       non_gui_paint_core.startx = non_gui_paint_core.lastx = stroke_array[0];
       non_gui_paint_core.starty = non_gui_paint_core.lasty = stroke_array[1];
 
+      non_gui_paint_core.flags |= TOOL_CAN_HANDLE_CHANGING_BRUSH;
+
       if (num_strokes == 1)
        paintbrush_non_gui_paint_func (&non_gui_paint_core, drawable, 0);
 
diff --git a/app/tools/paintbrush.c b/app/tools/paintbrush.c
index 8346061d82..b9b02b5173 100644
--- a/app/tools/paintbrush.c
+++ b/app/tools/paintbrush.c
@@ -517,6 +517,8 @@ paintbrush_non_gui_default (GimpDrawable *drawable,
       non_gui_paint_core.startx = non_gui_paint_core.lastx = stroke_array[0];
       non_gui_paint_core.starty = non_gui_paint_core.lasty = stroke_array[1];
 
+      non_gui_paint_core.flags |= TOOL_CAN_HANDLE_CHANGING_BRUSH;
+
       paintbrush_non_gui_paint_func (&non_gui_paint_core, drawable, 0);
 
       for (i = 1; i < num_strokes; i++)
@@ -566,6 +568,8 @@ paintbrush_non_gui (GimpDrawable *drawable,
       non_gui_paint_core.startx = non_gui_paint_core.lastx = stroke_array[0];
       non_gui_paint_core.starty = non_gui_paint_core.lasty = stroke_array[1];
 
+      non_gui_paint_core.flags |= TOOL_CAN_HANDLE_CHANGING_BRUSH;
+
       if (num_strokes == 1)
        paintbrush_non_gui_paint_func (&non_gui_paint_core, drawable, 0);