diff --git a/src/util/doc.jam b/src/util/doc.jam
index 4e43912b6..1b335a6de 100644
--- a/src/util/doc.jam
+++ b/src/util/doc.jam
@@ -650,7 +650,7 @@ local rule print-help-config (
 }
 
 
-ws = "	 " ;
+ws = "\t " ;
 
 # Extract the text from a block of comments.
 #
@@ -967,9 +967,7 @@ local rule read-file (
             content = [ SHELL "cat \"$(file)\"" ] ;
         }
         local lines ;
-        local nl = "
-" ;
-        local << = "([^$(nl)]*)[$(nl)](.*)" ;
+        local << = "([^\r\n]*)[\r]?[\n](.*)" ;
         local line+ = [ MATCH "$(<<)" : "$(content)" ] ;
         while $(line+)
         {