diff --git a/ChangeLog b/ChangeLog
index 02fd68034..71890cac5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ Bugs
  + Fixed grammar in feedback string (thanks to Uli Martens).
  + Addressed valgrind complaints (thanks to Bryce Harrington).
  + Removed default configuration value for the obsolete 'annotations' setting.
+ + Corrected rounding errors on burndown chart bar size calculations (thanks to
+   Uli Martens).
 
 ------ old releases ------------------------------
 
diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp
index 521ae385c..166bb22f3 100644
--- a/src/commands/CmdBurndown.cpp
+++ b/src/commands/CmdBurndown.cpp
@@ -518,18 +518,18 @@ std::string Chart::render ()
     // If it fits within the allowed space.
     if (bar.offset < actual_bars)
     {
-      int pending = (bar.pending                 * graph_height) / labels[2];
-      int started = (bar.started                 * graph_height) / labels[2];
-      int done    = ((bar.done + carryover_done) * graph_height) / labels[2];
+      int pending = ( bar.pending                                            * graph_height) / labels[2];
+      int started = ((bar.pending + bar.started)                             * graph_height) / labels[2];
+      int done    = ((bar.pending + bar.started + bar.done + carryover_done) * graph_height) / labels[2];
 
       for (int b = 0; b < pending; ++b)
         grid.replace (LOC (graph_height - b, max_label + 3 + ((actual_bars - bar.offset - 1) * 3)), 2, "PP");
 
-      for (int b = 0; b < started; ++b)
-        grid.replace (LOC (graph_height - b - pending, max_label + 3 + ((actual_bars - bar.offset - 1) * 3)), 2, "SS");
+      for (int b = pending; b < started; ++b)
+        grid.replace (LOC (graph_height - b, max_label + 3 + ((actual_bars - bar.offset - 1) * 3)), 2, "SS");
 
-      for (int b = 0; b < done; ++b)
-        grid.replace (LOC (graph_height - b - pending - started, max_label + 3 + ((actual_bars - bar.offset - 1) * 3)), 2, "DD");
+      for (int b = started; b < done; ++b)
+        grid.replace (LOC (graph_height - b, max_label + 3 + ((actual_bars - bar.offset - 1) * 3)), 2, "DD");
     }
   }