diff --git a/ChangeLog b/ChangeLog
index 818c28db89..b088df08f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-09  Sven Neumann  <sven@gimp.org>
+
+	* app/tools/gimppainttool.c (gimp_paint_tool_motion): don't paint
+	while the Shift key is pressed for line drawing (bug #529434).
+
 2008-07-08  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/help-browser/dialog.c (build_menu): plugged a memory leak.
@@ -15,7 +20,7 @@
 2008-07-07  Sven Neumann  <sven@gimp.org>
 
 	* app/paint/gimppaintoptions.c
-	(gimp_paint_options_get_dynamic_hardness) : applied patch from
+	(gimp_paint_options_get_dynamic_hardness): applied patch from
 	Alexia Death fixing a cut'n'paste error.
 
 2008-07-07  Sven Neumann  <sven@gimp.org>
diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c
index 6b79e69e27..2072a1bd58 100644
--- a/app/tools/gimppainttool.c
+++ b/app/tools/gimppainttool.c
@@ -453,8 +453,11 @@ gimp_paint_tool_motion (GimpTool        *tool,
   core->cur_coords.x -= off_x;
   core->cur_coords.y -= off_y;
 
-  GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state,
-                                          display);
+  GIMP_TOOL_CLASS (parent_class)->motion (tool, coords, time, state, display);
+
+  /*  don't paint while the Shift key is pressed for line drawing  */
+  if (paint_tool->draw_line)
+    return;
 
   gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
 
@@ -550,7 +553,7 @@ gimp_paint_tool_oper_update (GimpTool        *tool,
 
   gimp_tool_pop_status (tool, display);
 
-  if (tool->display          &&
+  if (tool->display            &&
       tool->display != display &&
       tool->display->image == display->image)
     {