diff --git a/ChangeLog b/ChangeLog
index 1b1d93f8a..ab8f27b73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,16 +2,22 @@
 ------ current release ---------------------------
 
 1.8.5 ()
- + Fixed bug that was causing the 'completed' report to sort incorrectly.
  + Added feature to allow the user to quit when asked to confirm multiple
    changes.  Now task asks "Proceed with change? (Yes/no/all/quit)".
+ + Added feature #341 that makes explicit references to the task and taskrc
+   man pages, both in the auto-generated .taskrc file and the version command
+   output (thanks to Cory Donnelly).
+ + Added feature - #310 that simplified and make clearer an error message
+   that complained about things that were beyond user control (thanks to
+   John Florian).
+ + Fixed bug that was causing the 'completed' report to sort incorrectly.
  + Fixed bug #321 where all shell input was converted to lower case (thanks
    to Juergen Daubert).
  + Fixed bug #327 that allowed the removal of a due date from a recurring
    task.
- + Fixed bug #317 which colored tasks in the 'completed' report according to
-   due dates, which are no longer relevant to a completed task (thanks to
-   Cory Donnelly).
+ + Fixed bug #317 which colored tasks in the 'completed' report according
+   to due dates, which are no longer relevant to a completed task (thanks
+   to Cory Donnelly).
  + Fixed bug that was causing the 'completed' report to sort incorrectly.
  + Fixed bug #322 which failed to propagate rc overrides to shell commands.
  + Fixed redundant messages when exiting shell mode.
@@ -24,9 +30,6 @@
  + Fixed bug #319 that caused task to not properly detect the removal of a
    tag when obtaining confirmation from the user fora bulk modification
    (thanks to Cory Donnelly).
- + Added feature - #310 that simplified and make clearer an error message
-   that complained about things that were beyond user control (thanks to
-   John Florian).
 
 ------ old releases ------------------------------
 
diff --git a/src/Config.cpp b/src/Config.cpp
index b99a98acb..4f2d657e1 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -100,7 +100,7 @@ void Config::createDefaultRC (const std::string& rc, const std::string& data)
   // Create a sample .taskrc file.
   std::stringstream contents;
   contents << "# Task program configuration file.\n"
-           << "# For more documentation, see http://taskwarrior.org\n"
+           << "# For more documentation, see http://taskwarrior.org or try 'man task' and 'man taskrc'\n"
            << "\n"
            << "# Files\n"
            << "data.location=" << data << "\n"
diff --git a/src/command.cpp b/src/command.cpp
index c2aede783..f3b4d86c1 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -436,7 +436,7 @@ int handleVersion (std::string &outs)
   link.addCell (link.addRow (), 0,
     "See http://taskwarrior.org for the latest releases, online documentation "
     "and lively discussion.  New releases containing fixes and enhancements "
-    "are made frequently.");
+    "are made frequently.  Don't forget the man pages 'man task' and 'man taskrc'.");
 
   std::vector <std::string> all;
   context.config.all (all);