diff --git a/options/help.jam b/options/help.jam
index 29a248d2c..085a1bfa7 100755
--- a/options/help.jam
+++ b/options/help.jam
@@ -1,10 +1,29 @@
 #  (C) Copyright David Abrahams 2003.
 #  (C) Copyright Rene Rivera 2003.
 #
-#  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.
+# Boost Software License - Version 1.0 - August 17th, 2003
+# 
+# Permission is hereby granted, free of charge, to any person or organization
+# obtaining a copy of the software and accompanying documentation covered by
+# this license (the "Software") to use, reproduce, display, distribute,
+# execute, and transmit the Software, and to prepare derivative works of the
+# Software, and to permit third-parties to whom the Software is furnished to
+# do so, all subject to the following:
+# 
+# The copyright notices in the Software and this entire statement, including
+# the above license grant, this restriction and the following disclaimer,
+# must be included in all copies of the Software, in whole or in part, and
+# all derivative works of the Software, unless such copies or derivative
+# works are solely in the form of machine-executable object code generated by
+# a source language processor.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+# SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+# FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
 
 # This module is the plug-in handler for the --help and --help-.*
 # command-line options
@@ -17,7 +36,9 @@ import set ;
 
 # List of possible modules, but which really aren't.
 #
-.not-modules = boost-build bootstrap site-config test user-config ;
+.not-modules =
+    boost-build bootstrap site-config test user-config
+    -tools allyourbase boost-base features python stlport testing unit-tests ;
 
 # The help system options are parsed here and handed off to the doc
 # module to translate into documentation requests and actions. The
@@ -44,13 +65,19 @@ rule process (
         case --help-all :
         local path-to-modules = [ modules.peek : BOOST_BUILD_PATH ] ;
         path-to-modules ?= . ;
+        local possible-modules = [ GLOB $(path-to-modules) : *\\.jam ] ;
+        local not-modules = [ GLOB $(path-to-modules) : *$(.not-modules)\\.jam ] ;
         local modules-to-list =
             [ sequence.insertion-sort
-                [ set.difference
-                    [ GLOB $(path-to-modules) : *\\.jam ] :
-                    [ GLOB $(path-to-modules) : $(.not-modules)\\.jam ] ] ] ;                
-        do-scan $(modules-to-list[1--2]) ;
-        do-scan $(modules-to-list[-1]) : print-help-all ;
+                [ set.difference $(possible-modules:D=:S=) : $(not-modules:D=:S=) ] ] ;
+        local modules-to-scan ;
+        for local m in $(modules-to-list)
+        {
+            local module-files = [ GLOB $(path-to-modules) : $(m)\\.jam ] ;
+            modules-to-scan += $(module-files[1]) ;
+        }
+        do-scan $(modules-to-scan[1--2]) ;
+        do-scan $(modules-to-scan[-1]) : print-help-all ;
         did-help = true ;
         
         case --help-enable-* :
diff --git a/v2/options/help.jam b/v2/options/help.jam
index 29a248d2c..085a1bfa7 100755
--- a/v2/options/help.jam
+++ b/v2/options/help.jam
@@ -1,10 +1,29 @@
 #  (C) Copyright David Abrahams 2003.
 #  (C) Copyright Rene Rivera 2003.
 #
-#  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.
+# Boost Software License - Version 1.0 - August 17th, 2003
+# 
+# Permission is hereby granted, free of charge, to any person or organization
+# obtaining a copy of the software and accompanying documentation covered by
+# this license (the "Software") to use, reproduce, display, distribute,
+# execute, and transmit the Software, and to prepare derivative works of the
+# Software, and to permit third-parties to whom the Software is furnished to
+# do so, all subject to the following:
+# 
+# The copyright notices in the Software and this entire statement, including
+# the above license grant, this restriction and the following disclaimer,
+# must be included in all copies of the Software, in whole or in part, and
+# all derivative works of the Software, unless such copies or derivative
+# works are solely in the form of machine-executable object code generated by
+# a source language processor.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+# SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+# FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
 
 # This module is the plug-in handler for the --help and --help-.*
 # command-line options
@@ -17,7 +36,9 @@ import set ;
 
 # List of possible modules, but which really aren't.
 #
-.not-modules = boost-build bootstrap site-config test user-config ;
+.not-modules =
+    boost-build bootstrap site-config test user-config
+    -tools allyourbase boost-base features python stlport testing unit-tests ;
 
 # The help system options are parsed here and handed off to the doc
 # module to translate into documentation requests and actions. The
@@ -44,13 +65,19 @@ rule process (
         case --help-all :
         local path-to-modules = [ modules.peek : BOOST_BUILD_PATH ] ;
         path-to-modules ?= . ;
+        local possible-modules = [ GLOB $(path-to-modules) : *\\.jam ] ;
+        local not-modules = [ GLOB $(path-to-modules) : *$(.not-modules)\\.jam ] ;
         local modules-to-list =
             [ sequence.insertion-sort
-                [ set.difference
-                    [ GLOB $(path-to-modules) : *\\.jam ] :
-                    [ GLOB $(path-to-modules) : $(.not-modules)\\.jam ] ] ] ;                
-        do-scan $(modules-to-list[1--2]) ;
-        do-scan $(modules-to-list[-1]) : print-help-all ;
+                [ set.difference $(possible-modules:D=:S=) : $(not-modules:D=:S=) ] ] ;
+        local modules-to-scan ;
+        for local m in $(modules-to-list)
+        {
+            local module-files = [ GLOB $(path-to-modules) : $(m)\\.jam ] ;
+            modules-to-scan += $(module-files[1]) ;
+        }
+        do-scan $(modules-to-scan[1--2]) ;
+        do-scan $(modules-to-scan[-1]) : print-help-all ;
         did-help = true ;
         
         case --help-enable-* :