diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 01638df7..23e3d21c 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,7 +1,7 @@
 #
 # Regression test Jamfile for boost configuration setup.
 # *** DO NOT EDIT THIS FILE BY HAND ***
-# This file was automatically generated on Fri Mar 28 16:52:14 2008
+# This file was automatically generated on Wed Apr 09 12:31:02 2008
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
@@ -11,14 +11,14 @@
 # If you need to alter build preferences then set them in
 # the template defined in options_v2.jam.
 #
-import testing ;
-
 path-constant DOT : . ;
 include $(DOT)/options_v2.jam ;
 
-run config_info.cpp ;
+run config_info.cpp  : : : <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static ;
+run config_info.cpp  : : : <threading>multi : config_info_threaded ;
 run math_info.cpp : : : <toolset>borland:<runtime-link>static <toolset>borland:<link>static ;
-run config_test.cpp ;
+run config_test.cpp : : : <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static ;
+run config_test.cpp : : : <threading>multi : config_test_threaded ;
 run limits_test.cpp ../../test/build//boost_test_exec_monitor ;
 run abi/abi_test.cpp abi/main.cpp  ;
 
diff --git a/test/config_info.cpp b/test/config_info.cpp
index d4d283f4..b31e6625 100644
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@@ -1021,6 +1021,8 @@ void print_boost_macros()
 
 
 
+
+
    // END GENERATED BLOCK
 
    PRINT_MACRO(BOOST_INTEL);
diff --git a/test/config_test.cpp b/test/config_test.cpp
index 5f8b3965..5180ea3c 100644
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Fri Mar 28 16:52:14 2008
+//  This file was automatically generated on Wed Apr 09 12:31:02 2008
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-4.
 //  Use, modification and distribution are subject to the 
diff --git a/tools/generate.cpp b/tools/generate.cpp
index 384ce6f7..57a61fb5 100644
--- a/tools/generate.cpp
+++ b/tools/generate.cpp
@@ -128,9 +128,11 @@ void write_jamfile_v2()
       "# the template defined in options_v2.jam.\n#\n"
       "path-constant DOT : . ;\n"
       "include $(DOT)/options_v2.jam ;\n\n"
-      "run config_info.cpp ;\n"
+      "run config_info.cpp  : : : <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static ;\n"
+      "run config_info.cpp  : : : <threading>multi : config_info_threaded ;\n"
       "run math_info.cpp : : : <toolset>borland:<runtime-link>static <toolset>borland:<link>static ;\n"
-      "run config_test.cpp ;\n"
+      "run config_test.cpp : : : <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static ;\n"
+      "run config_test.cpp : : : <threading>multi : config_test_threaded ;\n"
       "run limits_test.cpp ../../test/build//boost_test_exec_monitor ;\n"
       "run abi/abi_test.cpp abi/main.cpp  ;\n\n";
    ofs << jamfile_v2.str() << std::endl;