diff --git a/ChangeLog b/ChangeLog
index 0574f0a99..202c0a6d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
-
 ------ current release ---------------------------
 
+2.1.1 ()
+
+Bugs
+ + Fixed bug that caused miplaced commas in JSON export (thanks to greenskeleton).
+
+------ old releases ------------------------------
+
 2.1.0 (2012-07-23) a413331c9450b48065f94639e7ab0455eaa74293
 
 Features
@@ -116,8 +122,6 @@ Bugs
  + Fixed bug #1032, which prevented negative urgency coefficients from working
    for projects and tags.
 
------- old releases ------------------------------
-
 2.0.0 (2012-03-17) 03799eba9f230e48c4fa6d6ebddabe91bef7998f
 
 # Untracked Features, biggest first.
diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp
index 32b38ce13..8a8b5f602 100644
--- a/src/commands/CmdExport.cpp
+++ b/src/commands/CmdExport.cpp
@@ -66,14 +66,15 @@ int CmdExport::execute (std::string& output)
   std::vector <Task>::iterator task;
   for (task = filtered.begin (); task != filtered.end (); ++task)
   {
-    output += task->composeJSON (true);
-
     if (task != filtered.begin ())
-      output += ",";
+      output += ",\n";
 
-    output += "\n";
+    output += task->composeJSON (true);
   }
 
+  if (filtered.size ())
+    output += "\n";
+
   if (json_array)
     output += "]\n";