diff --git a/build/Jamfile b/build/Jamfile
index 00bb22dd..c8cf3d4e 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -63,7 +63,7 @@ include <module@>python.jam ;
 
 # This nasty hack works with versions of Python 1.5.2 -> 2.2 to avoid
 # building any Python stuff if there's no installation.
-SEARCH on <find-python-install>__init__.py = $(PYTHON_LIB_PATH)/test $(SUBDIR) ;
+SEARCH on <find-python-install>__init__.py = $(PYTHON_STDLIB_PATH)/test $(SUBDIR) ;
 include <find-python-install>__init__.py ;
 if ! $(gNO_PYTHON_INSTALL)
 {
diff --git a/build/__init__.py b/build/__init__.py
index 94f3b100..f89be274 100644
--- a/build/__init__.py
+++ b/build/__init__.py
@@ -3,12 +3,15 @@
 
 if ! $(gNO_PYTHON_INSTALL)
 {
-    ECHO Couldn't find Python $(PYTHON_VERSION) installation in $(PYTHON_ROOT) ;
+    ECHO "Couldn't find Python $(PYTHON_VERSION) installation in $(PYTHON_ROOT)" ;
     ECHO skipping Boost.Python library build ;
     ECHO You can configure the location of your python installation, by setting: ;
     ECHO PYTHON_ROOT - currently \"$(PYTHON_ROOT)\" ;
     ECHO PYTHON_VERSION - currently \"$(PYTHON_VERSION)\" ;
-    ECHO PYTHON_INCLUDES - configured from PYTHON_ROOT, currently \"$(PYTHON_INCLUDES)\" ;
-    ECHO PYTHON_LIB_PATH - configured from PYTHON_ROOT, currently \"$(PYTHON_LIB_PATH)\" ;
+    ECHO ;
+    ECHO "The following are automatically configured from PYTHON_ROOT if not otherwise set" ;
+    ECHO "    PYTHON_INCLUDES    - path to Python #include directories; currently" \"$(PYTHON_INCLUDES)\" ;
+    ECHO "    PYTHON_LIB_PATH    - path to Python library; currently" \"$(PYTHON_LIB_PATH)\" ;
+    ECHO "    PYTHON_STDLIB_PATH - path to Python standard library modules; currently" \"$(PYTHON_STDLIB_PATH)\" ;
 }
 gNO_PYTHON_INSTALL ?= true ;