diff --git a/AUTHORS b/AUTHORS
index 4148ca363..f0295d758 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -123,4 +123,4 @@ suggestions:
   Paul-Gheorghe Barbu
   Jennifer Cormier
   Joe Holloway
-
+  Peter Lewis
diff --git a/ChangeLog b/ChangeLog
index eae86e7ef..0273d73c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -241,6 +241,8 @@
  + Fixed bug #862, which suppressed feedback from the 'denotate' command.
  + Fixed bug #879, which mis-parsed escaped characters in the data file (thanks
    to Michelle Crane).
+ + Fixed bug #880, which listed the wrong file paths for themes (thanks to Peter
+   Lewis).
  + Fixed bug #892, which caused a segfault due to misuse of
    std::map::operator[] (thanks to Dmitriy Samborskiy).
  + Fixed bug #897, which adds the UUID field to the 'completed' report
diff --git a/test/upgrade.t b/test/upgrade.t
new file mode 100755
index 000000000..a60ff11bb
--- /dev/null
+++ b/test/upgrade.t
@@ -0,0 +1,67 @@
+#! /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 => 7;
+
+# Create the rc file.
+if (open my $fh, '>', 'upgrade.rc')
+{
+  print $fh "data.location=.\n",
+            "confirmation=off\n";
+  close $fh;
+  ok (-r 'upgrade.rc', 'Created upgrade.rc');
+}
+
+# Add a plain task, then upgrade to recurring, test for correctness.
+qx{../src/task rc:upgrade.rc add one};
+my $output = qx{../src/task rc:upgrade.rc 1 info};
+like ($output, qr/Status\s+Pending/,    'Plain task entered');
+
+qx{../src/task rc:upgrade.rc 1 modify due:tomorrow recur:weekly};
+qx{../src/task rc:upgrade.rc list};
+$output = qx{../src/task rc:upgrade.rc 1 info};
+like ($output, qr/Status\s+Recurring/,  'Upgraded parent: good status');
+like ($output, qr/Recurrence\s+weekly/, 'Upgraded parent: good recurrence');
+
+$output = qx{../src/task rc:upgrade.rc 2 info};
+like ($output, qr/Status\s+Pending/,    'Upgraded child: good status');
+like ($output, qr/Recurrence\s+weekly/, 'Upgraded child: good recurrence');
+
+# Cleanup.
+unlink qw(pending.data completed.data undo.data backlog.data synch.key upgrade.rc);
+ok (! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch.key'      &&
+    ! -r 'upgrade.rc', 'Cleanup');
+
+exit 0;
+