diff --git a/ChangeLog b/ChangeLog
index 109125ae3..8644d9551 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
  + Summary report bar colors can now be specified with color.summary.bar
    and color.summary.background configuration variables.
  + The configure script is more portable (thanks to Emil Sköldberg).
+ + Updated task-faq.5 man page.
+ + The 'edit' command now conveniently fills in the current date for new
+   annotations.
 
 ------ old releases ------------------------------
 
diff --git a/src/edit.cpp b/src/edit.cpp
index b094193e4..b4db2477d 100644
--- a/src/edit.cpp
+++ b/src/edit.cpp
@@ -168,9 +168,11 @@ static std::string formatTask (Task task)
            << " "                     << anno->value ()                                 << std::endl;
   }
 
-  before << "  Annotation:        "                                                     << std::endl
-         << "  Annotation:        "                                                     << std::endl
+  Date now;
+  before << "  Annotation:        " << now.toString (context.config.get ("dateformat")) << " " << std::endl
+         << "  Annotation:        " << now.toString (context.config.get ("dateformat")) << " " << std::endl
          << "# End"                                                                     << std::endl;
+
   return before.str ();
 }