diff --git a/bootstrap.bat b/bootstrap.bat
index da93b55566..eeb4a13982 100644
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -51,7 +51,12 @@ IF "%1"=="vc12" SET TOOLSET=msvc : 12.0
 IF "%1"=="vc14" SET TOOLSET=msvc : 14.0
 IF "%1"=="vc141" SET TOOLSET=msvc : 14.1
 
-ECHO import option ; > project-config.jam
+ECHO.
+ECHO Generating Boost.Build configuration in project-config.jam for %TOOLSET%...
+ECHO # Boost.Build Configuration > project-config.jam
+ECHO # Automatically generated by bootstrap.bat >> project-config.jam
+ECHO. >> project-config.jam
+ECHO import option ; >> project-config.jam
 ECHO. >> project-config.jam
 ECHO using %TOOLSET% ; >> project-config.jam
 ECHO. >> project-config.jam
@@ -62,7 +67,11 @@ ECHO.
 ECHO Bootstrapping is done. To build, run:
 ECHO.
 ECHO     .\b2
-ECHO.    
+ECHO.
+ECHO.    To generate header files, run:
+ECHO.
+ECHO.    .\b2 headers
+ECHO.
 ECHO To adjust configuration, edit 'project-config.jam'.
 ECHO Further information:
 ECHO.
diff --git a/bootstrap.sh b/bootstrap.sh
index c6f3423d3d..98ae1b987f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -328,7 +328,7 @@ if test -r "project-config.jam"; then
 fi
 
 # Generate user-config.jam
-echo "Generating Boost.Build configuration in project-config.jam..."
+echo "Generating Boost.Build configuration in project-config.jam for $TOOLSET..."
 cat > project-config.jam <<EOF
 # Boost.Build Configuration
 # Automatically generated by bootstrap.sh
@@ -393,6 +393,10 @@ Bootstrapping is done. To build, run:
 
     ./b2
     
+To generate header files, run:
+
+    ./b2 headers
+
 To adjust configuration, edit 'project-config.jam'.
 Further information: