diff --git a/AUTHORS b/AUTHORS
index 2b9db1e63..5d9c1e005 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -126,4 +126,5 @@ suggestions:
   Peter Lewis
   Najmi Ahmad Zabidi
   Philipp Woelfel
+  Tuomas Toivola
 
diff --git a/ChangeLog b/ChangeLog
index 06f94e3eb..97419a607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -280,7 +280,11 @@
  + Fixed bug #938, which corrected compiler warnings on Solaris (thanks to Owen
    Clarke).
  + Fixed bug #944, which caused a test to fail when it was run on an NFS share.
+ + Fixed bug #946, which caused 'edit' command problems when
+   'dateformat.annotation' did not contain any date elements (thanks to Tuomas
+   Toivola).
  + Fixed bug #951, which caused tag filtering to fail (thanks to Max Muller).
+ + Fixed bug #952, which generated cmake warnings on Cygwin.
 
 # Untracked Bugs, biggest first.
  + Fixed bug that required the '%YAML' prologue in a YAML import.
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index cba3999c9..37ec34780 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -204,12 +204,12 @@ std::string CmdEdit::formatTask (Task task)
   for (anno = annotations.begin (); anno != annotations.end (); ++anno)
   {
     Date dt (strtol (anno->first.substr (11).c_str (), NULL, 10));
-    before << "  Annotation:        " << dt.toString (context.config.get ("dateformat.annotation"))
+    before << "  Annotation:        " << dt.toString (context.config.get ("dateformat"))
            << " -- "                  << anno->second << "\n";
   }
 
   Date now;
-  before << "  Annotation:        " << now.toString (context.config.get ("dateformat.annotation")) << " -- \n";
+  before << "  Annotation:        " << now.toString (context.config.get ("dateformat")) << " -- \n";
 
   // Add dependencies here.
   std::vector <std::string> dependencies;