diff --git a/AUTHORS b/AUTHORS
index 443fd142d..de0e2c89a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -152,4 +152,5 @@ suggestions:
   Stanley G
   Marek Vitek
   Rene Vergara
+  Stéphane Pezennec
 
diff --git a/ChangeLog b/ChangeLog
index cff6aa6d6..096e426ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,16 @@
-
 ------ current release ---------------------------
 
 2.2.0 ()
 
 ------ old releases ------------------------------
 
+2.1.1 (2012-07-24) 46c5f8b826838ce96d9df7fcd3039de3c43483dd
+
+Bugs
+ + Fixed bug that caused miplaced commas in JSON export (thanks to greenskeleton).
+ + Fixed bug #1036, which prevents 'until' attributes to be modified for
+   non-recurring tasks (thanks to Stéphane Pezennec).
+
 2.1.0 (2012-07-23) a413331c9450b48065f94639e7ab0455eaa74293
 
 Features
@@ -45,6 +51,8 @@ Features
  + Color error messages with a specific configuration variable 'color.error'.
 
 Bugs
+ + Fixed bug #734, which allows a sequence of IDs to work when modifying the
+   attribute "depends" (thanks to Andreas Kalex).
  + Applied patch for bug #919, so the holidays listed on the 'calendar' report
    are sorted (thanks to Jörg Plate).
  + Fixed bug #954, which caused bulk deletions when using a UUID filter term and
diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in
index 896c77a35..a913ca640 100644
--- a/doc/man/task-color.5.in
+++ b/doc/man/task-color.5.in
@@ -1,4 +1,4 @@
-.TH task-color 5 2012-07-23 "${PACKAGE_STRING}" "User Manuals"
+.TH task-color 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-color \- A color tutorial for the taskwarrior command line todo manager.
diff --git a/doc/man/task-faq.5.in b/doc/man/task-faq.5.in
index b7f1dd80b..b3a02adcb 100644
--- a/doc/man/task-faq.5.in
+++ b/doc/man/task-faq.5.in
@@ -1,4 +1,4 @@
-.TH task-faq 5 2012-07-23 "${PACKAGE_STRING}" "User Manuals"
+.TH task-faq 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-faq \- A FAQ for the task(1) command line todo manager.
diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in
index a39458e2e..458f38d3e 100644
--- a/doc/man/task-sync.5.in
+++ b/doc/man/task-sync.5.in
@@ -1,4 +1,4 @@
-.TH task-sync 5 2012-07-23 "${PACKAGE_STRING}" "User Manuals"
+.TH task-sync 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-sync \- A tutorial for the task(1) data synchronization capabilities.
diff --git a/doc/man/task-tutorial.5.in b/doc/man/task-tutorial.5.in
index 664a841da..9feecfd11 100644
--- a/doc/man/task-tutorial.5.in
+++ b/doc/man/task-tutorial.5.in
@@ -1,4 +1,4 @@
-.TH task-tutorial 5 2012-07-23 "${PACKAGE_STRING}" "User Manuals"
+.TH task-tutorial 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-tutorial \- A tutorial for the task(1) command line todo manager.
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 147e5f0e3..8e868ef72 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1,4 +1,4 @@
-.TH task 1 2012-07-23 "${PACKAGE_STRING}" "User Manuals"
+.TH task 1 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task \- A command line todo manager.
@@ -18,13 +18,11 @@ At the core, taskwarrior is a list processing program. You add text and
 additional related parameters and redisplay the information in a nice way.  It
 turns into a todo list program when you add due dates and recurrence. It turns
 into an organized todo list program when you add priorities, tags (one word
-descriptors), project groups, etc.  Taskwarrior turns into an organized to do
-list program when you modify the configuration file to have the output displayed
-the way you want to see it.
+descriptors), project groups, etc.
 
 .SH FILTER
 The <filter> consists of zero or more search criteria that select tasks.  For
-example, to list all tasks belonging to the 'Home' project:
+example, to list all pending tasks belonging to the 'Home' project:
 
   task project:Home list
 
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index b8178464a..91c5cfdc7 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1,4 +1,4 @@
-.TH taskrc 5 2012-07-23 "${PACKAGE_STRING}" "User Manuals"
+.TH taskrc 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 taskrc \- Configuration file for the task(1) command
@@ -280,7 +280,7 @@ and project.  The others are sent to standard output.
 .B confirmation=yes
 May be "yes" or "no", and determines whether taskwarrior will ask for
 confirmation before deleting a task, performing bulk changes, or the undo
-command.  The default value is "yes".  Consider leaving this setting as "no",
+command.  The default value is "yes".  Consider leaving this setting as "yes",
 for safety.
 
 .TP
@@ -1196,8 +1196,7 @@ An optional value to a report limiting the number of displayed tasks in the
 generated report.  Deprecated.
 
 .TP
-Taskwarrior comes with a number of predefined reports in its default
-configuration file. These reports are:
+Taskwarrior comes with a number of predefined reports, which are:
 
 .TP
 .B next
@@ -1205,7 +1204,7 @@ Lists the most important tasks.
 
 .TP
 .B long
-Lists all tasks and all data, matching the specified criteria.
+Lists all pending tasks and all data, matching the specified criteria.
 
 .TP
 .B list
diff --git a/doc/ref/task-ref.pages b/doc/ref/task-ref.pages
index d3c87909e..6a524f977 100644
Binary files a/doc/ref/task-ref.pages and b/doc/ref/task-ref.pages differ
diff --git a/doc/ref/task-ref.pdf b/doc/ref/task-ref.pdf
index 8f9af3de9..3efe819cc 100644
Binary files a/doc/ref/task-ref.pdf and b/doc/ref/task-ref.pdf differ
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";
 
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index 99fb43f6e..3fc87996e 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -83,11 +83,6 @@ int CmdModify::execute (std::string& output)
           !before.has ("due"))
         throw std::string (STRING_CMD_MODIFY_NO_DUE);
 
-      if (task->has ("until")  &&
-          !task->has ("recur") &&
-          !before.has ("recur"))
-        throw std::string (STRING_CMD_MODIFY_UNTIL);
-
       if (before.has ("recur") &&
           before.has ("due")   &&
           (!task->has ("due")  ||
diff --git a/src/en-US.h b/src/en-US.h
index d5a811277..915888e07 100644
--- a/src/en-US.h
+++ b/src/en-US.h
@@ -448,7 +448,6 @@
 
 #define STRING_CMD_MODIFY_USAGE1     "Modifies the existing task with provided arguments."
 #define STRING_CMD_MODIFY_NO_DUE     "You cannot specify a recurring task without a due date."
-#define STRING_CMD_MODIFY_UNTIL      "You cannot specify an until date for a non-recurring task."
 #define STRING_CMD_MODIFY_REM_DUE    "You cannot remove the due date from a recurring task."
 #define STRING_CMD_MODIFY_REC_ALWAYS "You cannot remove the recurrence from a recurring task."
 #define STRING_CMD_MODIFY_TASK       "Modifying task {1} '{2}'."
diff --git a/test/bug.1036.t b/test/bug.1036.t
new file mode 100755
index 000000000..b60b3d4ec
--- /dev/null
+++ b/test/bug.1036.t
@@ -0,0 +1,63 @@
+#! /usr/bin/perl
+################################################################################
+## taskwarrior - a command line task list manager.
+##
+## Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+##
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included
+## in all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+## SOFTWARE.
+##
+## http://www.opensource.org/licenses/mit-license.php
+##
+################################################################################
+
+use strict;
+use warnings;
+use Test::More tests => 4;
+
+# Create the rc file.
+if (open my $fh, '>', 'bug.rc')
+{
+  print $fh "data.location=.\n";
+  close $fh;
+  ok (-r 'bug.rc', 'Created bug.rc');
+}
+
+# Bug #1036: prevents 'until' attributes to be modified for non-recurring
+# tasks.
+
+# Check that until attribute may be modified
+qx{../src/task rc:bug.rc add test 2>&1};
+my $output = qx{../src/task rc:bug.rc 1 mod until:1/1/2020 2>&1};
+like ($output, qr/^Modifying task 1 'test'.$/ms, '"until" attribute added');
+
+qx{../src/task rc:bug.rc add test until:1/1/2020 2>&1};
+$output = qx{../src/task rc:bug.rc 1 mod /test/Test/ 2>&1};
+like ($output, qr/^Modifying task 1 'Test'.$/ms, 'Task with "until" attribute modified');
+
+# Cleanup.
+unlink qw(pending.data completed.data undo.data backlog.data synch.key bug.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch.key'      &&
+    ! -r 'bug.rc', 'Cleanup');
+
+exit 0;
+