diff --git a/AUTHORS b/AUTHORS
index ce785fda8..273d2acc1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,4 +29,5 @@ With thanks to:
   Eric Farris
   Bruce Dillahunty
   Askme Too
+  P.C. Shyamshankar
 
diff --git a/ChangeLog b/ChangeLog
index 2713a9a27..266042125 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 
 ------ old releases ------------------------------
 
+1.6.1 (4/24/2009) 1b6faf57c998617024d0348a87b941a5d2ab2249
+  + Fixed bug that caused new, first-time .taskrc files to be written without
+    including the custom report labels (thanks to P.C. Shyamshankar).
+
 1.6.0 (4/12/2009) 06062a96eb57d10dcd7fbe1edf968bb638a0b3a9
   + Added support for new "append" command that adds more description text to
     an existing task.
diff --git a/NEWS b/NEWS
index 60b40cba4..3e9b96087 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Task has been built and tested on the following configurations:
   - Ubuntu 7 Feisty Fawn
   - Ubuntu 8 Hardy Heron
   - Ubuntu 8.10 Intrepid Ibex
-  - Ubuntu 9.04 Jaunty Jackalope (beta)
+  - Ubuntu 9.04 Jaunty Jackalope
   - Solaris 10
   - Cygwin 1.5.25-14
 
diff --git a/html/task.html b/html/task.html
index b0a146a36..a4616f4e2 100644
--- a/html/task.html
+++ b/html/task.html
@@ -79,81 +79,44 @@
                 <table>
                   <tr>
                     <td>Source:</td>
-                    <td><a href="http://www.beckingham.net/task-1.6.0.tar.gz">task-1.6.0.tar.gz</a></td>
+                    <td><a href="http://www.beckingham.net/task-1.7.0.tar.gz">task-1.7.0.tar.gz</a></td>
                   </tr>
+<!--
                   <tr>
                     <td>Mac OS X 10.5 (Leopard) Intel-only:</td>
-                    <td><a href="http://www.beckingham.net/task-1.6.0.pkg">task-1.6.0.pkg</a></td>
+                    <td><a href="http://www.beckingham.net/task-1.7.0.pkg">task-1.7.0.pkg</a></td>
                   </tr>
                   <tr>
                     <td>
                       Debian:
                       (Thanks to <a href="http://blog.rfquerin.org">Richard&nbsp;Querin</a>):
                     </td>
-                    <td><a href="http://www.beckingham.net/task_1.6.0-1_i386.deb">task_1.6.0-1_i386.deb</a></td>
+                    <td><a href="http://www.beckingham.net/task_1.7.0-1_i386.deb">task_1.7.0-1_i386.deb</a></td>
                   </tr>
                   <tr>
                     <td>
                       Red Hat:
                       (Thanks to <a href="http://www.ultrafredde.com">Federico&nbsp;Hernandez</a>):
                     </td>
-                    <td><a href="http://www.beckingham.net/task-1.6.0-1.i386.rpm">task-1.6.0-1.i386.rpm</a></td>
+                    <td><a href="http://www.beckingham.net/task-1.7.0-1.FC10.i386.rpm">task-1.7.0-1.FC10.i386.rpm</a></td>
                   </tr>
+-->
                   <tr>
                     <td>Git - get the whole source and history:</td>
                     <td><a href="http://github.com/pbeckingham/task">http://github.com/pbeckingham/task</a></td>
                   </tr>
                 </table>
 
-                <h4>New in version 1.6.0 (?)</h4>
+                <h4>New in version 1.7.0 (?)</h4>
                 <ul>
-                  <li>Added support for new "append" command that adds more description text to
-                      an existing task.
-                  <li>Added support for the "weekdays" recurrence, which means a task can recur
-                      five times a week, and not on weekends (thanks to Chris Pride).
-                  <li>UTF8 text is now supported in task project names, tags and descriptions.
-                  <li>Fixed bug that caused the y/n confirmation on task deletion to ignore the
-                      Enter key and fail to re-prompt (thanks to Bruce Dillahunty).
-                  <li>When the "echo.command" configuration variable is set to "yes", it causes
-                      commands that modify tasks to display which task was affected (thanks to
-                      Bruce Dillahunty).
-                  <li>A task can now be annotated with the command "task <id> annotate ...", and
-                      a timestamped annotation will appear in reports.
-                  <li>A 'description_only' column is now available for use in custom reports,
-                      and it excludes annotations.
-                  <li>A task can now be upgraded to a recurring task by adding a recurrence
-                      frequency, a due date, and an optional until date.
-                  <li>When a recurring task is modified, all other instances of the recurring
-                      task are also modified.
-                  <li>Custom reports now support user-specified column labels (thanks to T.
-                      Charles Yun).
-                  <li>Task can now import tasks from a variety of data formats, including task
-                      export files from versions 1.4.3 and earlier, versions 1.5.0 and later,
-                      todo.sh 2.x, CSV, plain text and task command line.  See online docs for
-                      full details.
-                  <li>Export was including 'id' in the column header even though it was not
-                      included in the data.
-                  <li>The task file format has changed slightly.  Please back up your task
-                      data files before upgrading to 1.6.0.
-                  <li>Added new column 'recurrence_indicator' that displays an 'R' if the task
-                      is a recurring task.  This column can be added to any custom report.
-                  <li>Added new column 'tag_indicator' that displays a '+' if the task
-                      has any tags.  This column can be added to any custom report.
-                  <li>Fixed bug where sometimes a task description was concatenated oddly if
-                      there was a colon somewhere in the description.
-                  <li>Fixed bug that caused recurring annual tasks to exhibit a creeping due
-                      date, because of an assumption of 365 days per year, which failed to
-                      consider leap years (thanks to T. Charles Yun).
-                  <li>Annotations can now be modified with the substitution commands /from/to/.
-                  <li>Substitutions can now be made global with /from/to/g and all occurrences
-                      of "from" will be replaced with "to".
+                  <li>
                 </ul>
 
                 <p>
                   (Find out <a href="versions.html">what was new in prior versions</a>)
                 </p>
 <!--
-                <h2>Task 1.6.0 Beta</h2>
+                <h2>Task 1.7.0 Beta</h2>
                 <p>
                   The next version of task is in beta.  This means it is approaching the
                   end of the current development and testing cycle, and feedback from
@@ -173,7 +136,7 @@
                 <table>
                   <tr>
                     <td>Source:</td>
-                    <td><a href="http://www.beckingham.net/task-1.6.0beta.tar.gz">task-1.6.0beta.tar.gz</a></td>
+                    <td><a href="http://www.beckingham.net/task-1.7.0beta.tar.gz">task-1.7.0beta.tar.gz</a></td>
                   </tr>
                 </table>
 -->
@@ -192,6 +155,7 @@
                     <li>Ubuntu 7 Feisty Fawn
                     <li>Ubuntu 8 Hardy Heron
                     <li>Ubuntu 8.10 Intrepid Ibex
+                    <li>Ubuntu 9.04 Jaunty Jackalope
                     <li>Solaris 10
                     <li>Cygwin 1.5.25-14
                   </ul>
diff --git a/html/versions.html b/html/versions.html
index e9dee7fd8..6044b464b 100644
--- a/html/versions.html
+++ b/html/versions.html
@@ -36,6 +36,121 @@
               <br />
 
               <div class="content">
+                <h4>New in version 1.6.1 (4/24/2009)</h4>
+                <p>
+                  <table>
+                    <tr>
+                      <td>Source:</td>
+                      <td><a href="http://www.beckingham.net/task-1.6.1.tar.gz">task-1.6.1.tar.gz</a></td>
+                    </tr>
+<!--
+                    <tr>
+                      <td>Mac OS X 10.5 (Leopard) Intel-only:</td>
+                      <td><a href="http://www.beckingham.net/task-1.6.1.pkg">task-1.6.1.pkg</a></td>
+                    </tr>
+                    <tr>
+                      <td>
+                        Debian:
+                        (Thanks to <a href="http://blog.rfquerin.org">Richard&nbsp;Querin</a>):
+                      </td>
+                      <td><a href="http://www.beckingham.net/task_1.6.1-1_i386.deb">task_1.6.1-1_i386.deb</a></td>
+                    </tr>
+                    <tr>
+                      <td>
+                        Red Hat:
+                        (Thanks to <a href="http://www.ultrafredde.com">Federico&nbsp;Hernandez</a>):
+                      </td>
+                      <td><a href="http://www.beckingham.net/task-1.6.1-1.FC10.i386.rpm">task-1.6.1-1.FC10.i386.rpm</a></td>
+                    </tr>
+-->
+                    <tr>
+                      <td>Git - get the whole source and history:</td>
+                      <td><a href="http://github.com/pbeckingham/task">http://github.com/pbeckingham/task</a></td>
+                    </tr>
+                  </table>
+
+                  <ul>
+                    <li>Fixed bug that caused new, first-time .taskrc files to be written without
+                        including the custom report labels (thanks to P.C. Shyamshankar).
+                  </ul>
+                </p>
+
+                <h4>New in version 1.6.0 (4/13/2009)</h4>
+                <p>
+                  <table>
+                    <tr>
+                      <td>Source:</td>
+                      <td><a href="http://www.beckingham.net/task-1.6.0.tar.gz">task-1.6.0.tar.gz</a></td>
+                    </tr>
+<!--
+                    <tr>
+                      <td>Mac OS X 10.5 (Leopard) Intel-only:</td>
+                      <td><a href="http://www.beckingham.net/task-1.6.0.pkg">task-1.6.0.pkg</a></td>
+                    </tr>
+                    <tr>
+                      <td>
+                        Debian:
+                        (Thanks to <a href="http://blog.rfquerin.org">Richard&nbsp;Querin</a>):
+                      </td>
+                      <td><a href="http://www.beckingham.net/task_1.6.0-1_i386.deb">task_1.6.0-1_i386.deb</a></td>
+                    </tr>
+-->
+                    <tr>
+                      <td>
+                        Red Hat:
+                        (Thanks to <a href="http://www.ultrafredde.com">Federico&nbsp;Hernandez</a>):
+                      </td>
+                      <td><a href="http://www.beckingham.net/task-1.6.0-1.FC10.i386.rpm">task-1.6.0-1.FC10.i386.rpm</a></td>
+                    </tr>
+                    <tr>
+                      <td>Git - get the whole source and history:</td>
+                      <td><a href="http://github.com/pbeckingham/task">http://github.com/pbeckingham/task</a></td>
+                    </tr>
+                  </table>
+
+                  <ul>
+                    <li>Added support for new "append" command that adds more description text to
+                        an existing task.
+                    <li>Added support for the "weekdays" recurrence, which means a task can recur
+                        five times a week, and not on weekends (thanks to Chris Pride).
+                    <li>UTF8 text is now supported in task project names, tags and descriptions.
+                    <li>Fixed bug that caused the y/n confirmation on task deletion to ignore the
+                        Enter key and fail to re-prompt (thanks to Bruce Dillahunty).
+                    <li>When the "echo.command" configuration variable is set to "yes", it causes
+                        commands that modify tasks to display which task was affected (thanks to
+                        Bruce Dillahunty).
+                    <li>A task can now be annotated with the command "task <id> annotate ...", and
+                        a timestamped annotation will appear in reports.
+                    <li>A 'description_only' column is now available for use in custom reports,
+                        and it excludes annotations.
+                    <li>A task can now be upgraded to a recurring task by adding a recurrence
+                        frequency, a due date, and an optional until date.
+                    <li>When a recurring task is modified, all other instances of the recurring
+                        task are also modified.
+                    <li>Custom reports now support user-specified column labels (thanks to T.
+                        Charles Yun).
+                    <li>Task can now import tasks from a variety of data formats, including task
+                        export files from versions 1.4.3 and earlier, versions 1.5.0 and later,
+                        todo.sh 2.x, CSV, plain text and task command line.  See online docs for
+                        full details.
+                    <li>Export was including 'id' in the column header even though it was not
+                        included in the data.
+                    <li>The task file format has changed slightly.  Please back up your task
+                        data files before upgrading to 1.6.0.
+                    <li>Added new column 'recurrence_indicator' that displays an 'R' if the task
+                        is a recurring task.  This column can be added to any custom report.
+                    <li>Added new column 'tag_indicator' that displays a '+' if the task
+                        has any tags.  This column can be added to any custom report.
+                    <li>Fixed bug where sometimes a task description was concatenated oddly if
+                        there was a colon somewhere in the description.
+                    <li>Fixed bug that caused recurring annual tasks to exhibit a creeping due
+                        date, because of an assumption of 365 days per year, which failed to
+                        consider leap years (thanks to T. Charles Yun).
+                    <li>Annotations can now be modified with the substitution commands /from/to/.
+                    <li>Substitutions can now be made global with /from/to/g and all occurrences
+                        of "from" will be replaced with "to".
+                  </ul>
+                </p>
 
                 <p>
                   <h4>New in version 1.5.0 (3/15/2009)</h4>
diff --git a/src/Config.cpp b/src/Config.cpp
index 17206c1ae..5403accec 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -183,23 +183,28 @@ void Config::createDefault (const std::string& home)
         fprintf (out, "# Limit:         10\n");
 
         fprintf (out, "report.long.description=Lists all task, all data, matching the specified criteria\n");
+        fprintf (out, "report.long.labels=ID,Project,Pri,Added,Started,Due,Recur,Age,Tags,Description\n");
         fprintf (out, "report.long.columns=id,project,priority,entry,start,due,recur,age,tags,description\n");
         fprintf (out, "report.long.sort=due+,priority-,project+\n");
 
         fprintf (out, "report.list.description=Lists all tasks matching the specified criteria\n");
+        fprintf (out, "report.list.labels=ID,Project,Pri,Due,Active,Age,Description\n");
         fprintf (out, "report.list.columns=id,project,priority,due,active,age,description\n");
         fprintf (out, "report.list.sort=due+,priority-,project+\n");
 
         fprintf (out, "report.ls.description=Minimal listing of all tasks matching the specified criteria\n");
+        fprintf (out, "report.ls.labels=ID,Project,Pri,Description\n");
         fprintf (out, "report.ls.columns=id,project,priority,description\n");
         fprintf (out, "report.ls.sort=priority-,project+\n");
 
         fprintf (out, "report.newest.description=Shows the newest tasks\n");
+        fprintf (out, "report.newest.labels=ID,Project,Pri,Due,Active,Age,Description\n");
         fprintf (out, "report.newest.columns=id,project,priority,due,active,age,description\n");
         fprintf (out, "report.newest.sort=id-\n");
         fprintf (out, "report.newest.limit=10\n");
 
         fprintf (out, "report.oldest.description=Shows the oldest tasks\n");
+        fprintf (out, "report.oldest.labels=ID,Project,Pri,Due,Active,Age,Description\n");
         fprintf (out, "report.oldest.columns=id,project,priority,due,active,age,description\n");
         fprintf (out, "report.oldest.sort=id+\n");
         fprintf (out, "report.oldest.limit=10\n");
diff --git a/src/tests/t.t.cpp b/src/tests/t.t.cpp
index e36012988..b0a30c6ae 100644
--- a/src/tests/t.t.cpp
+++ b/src/tests/t.t.cpp
@@ -86,7 +86,7 @@ int main (int argc, char** argv)
   t.setDescription ("sample");
   std::string format = t.compose ();
   test.is (format.substr (36, 20), " - [foo] [bar:baz] [", "compose tag, attribute");
-  test.is (format.substr (66, 16), ":'woof'] sample\n",    "compose annotation");
+  test.is (format.substr (66, 16), ":\"woof\"] sample\n",  "compose annotation");
   test.is (t.getAnnotationCount (), 1,                     "annotation count");
 
   return 0;