diff --git a/src/util/doc.jam b/src/util/doc.jam
index 32051d892..c41b4b199 100644
--- a/src/util/doc.jam
+++ b/src/util/doc.jam
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, Rene Rivera. Permission to copy, use, modify, sell and
+# Copyright (C) 2002-2003, Rene Rivera. Permission to copy, use, modify, sell and
 # distribute this software is granted provided this copyright notice appears in
 # all copies. This software is provided "as is" without express or implied
 # warranty, and with no claim as to its suitability for any purpose.
@@ -130,6 +130,10 @@ rule help ( )
         }
         command = [ $(args).front ] ; $(args).pop-front ;
     }
+    if $(did-help)
+    {
+        UPDATE all ;
+    }
     return $(did-help) ;
 }
 
@@ -345,11 +349,15 @@ local rule print-help-top ( )
     print.section "Available Help"
         These are the available options for obtaining documentation.
         Some options have additional instructions on how to get more
-        detailed information.
+        detailed information. Multiple options are allowed and
+        sometimes required. For example, the options that configure
+        the help system still require a regular help request option
+        for any output to be generated.
         ;
     print.list-start ;
     print.list-item --help; This help message. ;
     print.list-item --help-all; Brief information on available modules. ;
+    print.list-item --help <module-name>; Get information about a module. ;
     print.list-item --help-options; Options for controlling the help display. ;
     print.list-item --help-output <type>; The type of output to genetare.
         '"console" is formated text echoed to the console (the default);'
diff --git a/src/util/print.jam b/src/util/print.jam
index f6222bfc9..1a5dc2efe 100644
--- a/src/util/print.jam
+++ b/src/util/print.jam
@@ -1,4 +1,4 @@
-#  Copyright (C) 2002, Rene Rivera. Permission to copy, use, modify, sell and
+#  Copyright (C) 2002-2003, Rene Rivera. Permission to copy, use, modify, sell and
 #  distribute this software is granted provided this copyright notice appears in
 #  all copies. This software is provided "as is" without express or implied
 #  warranty, and with no claim as to its suitability for any purpose.
@@ -10,6 +10,7 @@
 import modules ;
 import numbers ;
 import string ;
+import regex ;
 
 # The current output target. Defaults to console.
 output-target = console ;
@@ -241,7 +242,9 @@ rule text (
         while $(strings)
         {
             local line-v = $(output-target).line.$($(output-target).line) ;
-            $(line-v) on $(output-target) = $(strings[1]) ;
+            local echo-string = [ regex.split $(strings[1]) "\"" ] ;
+            echo-string = $(echo-string:J="''") ;
+            $(line-v) on $(output-target) = $(echo-string) ;
             NOCARE $(line-v) ;
             NOTFILE $(line-v) ;
             text-action $(output-target) : $(line-v) ;
@@ -263,7 +266,7 @@ rule wrapped-text ( text + )
 #
 actions quietly text-action
 {
-    echo '$($(>))' >> $(<)
+    echo "$($(>))" >> $(<)
 }
 
 local rule __test__ ( )