diff --git a/AUTHORS b/AUTHORS
index 74e039659..1b90942b0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -109,4 +109,5 @@ suggestions:
   John Hammond
   Arkady Grudzinsky
   Bernhard B
+  Aikido Guy
 
diff --git a/ChangeLog b/ChangeLog
index 9139776d0..10ac82a86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,8 @@
    instead of the proper line in .taskrc (thanks to Erlan Sergaziev).
  + Fixed bug #691, which was a mis-reporting of file lock state even when file
    locking was turned off (thanks to Tom Duffy).
+ + Fixed bug #694, which allows attributes to be modified while annotating a
+   task (thanks to Aikido Guy).
  + Fixed bug #696, where the command line parser was confused by a single '-'
    or '+' character.
  + Fixed bug #699, truncated ssh://... during autopush after merge.
diff --git a/test/bug.694.t b/test/bug.694.t
new file mode 100755
index 000000000..5fb76637a
--- /dev/null
+++ b/test/bug.694.t
@@ -0,0 +1,73 @@
+#! /usr/bin/perl
+################################################################################
+## taskwarrior - a command line task list manager.
+##
+## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
+## All rights reserved.
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 2 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, write to the
+##
+##     Free Software Foundation, Inc.,
+##     51 Franklin Street, Fifth Floor,
+##     Boston, MA
+##     02110-1301
+##     USA
+##
+################################################################################
+
+use strict;
+use warnings;
+use Test::More tests => 10;
+
+# 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 694: Potential bug for "due" and "annotate"
+
+# Setup: Add a tasks, annotate with long word.
+qx{../src/task rc:bug.rc add One};
+qx{../src/task rc:bug.rc 1 annotate foo due:today};
+
+# List with rc.hyphenate=on.
+my $output = qx{../src/task rc:bug.rc 1 info};
+like ($output, qr/One/, 'found One');
+like ($output, qr/foo/, 'found foo');
+like ($output, qr/Due/, 'found Due');
+
+# Cleanup.
+unlink 'pending.data';
+ok (!-r 'pending.data', 'Removed pending.data');
+
+unlink 'completed.data';
+ok (!-r 'completed.data', 'Removed completed.data');
+
+unlink 'undo.data';
+ok (!-r 'undo.data', 'Removed undo.data');
+
+unlink 'backlog.data';
+ok (!-r 'backlog.data', 'Removed backlog.data');
+
+unlink 'synch.key';
+ok (!-r 'synch.key', 'Removed synch.key');
+
+unlink 'bug.rc';
+ok (!-r 'bug.rc', 'Removed bug.rc');
+
+exit 0;
+