diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 3e9da49b..04cbaaa2 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 Sat Aug 25 12:32:22 2007
+# This file was automatically generated on Fri Oct 19 13:34:11 2007
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
@@ -357,5 +357,3 @@ test-suite "BOOST_NO_INTRINSIC_WCHAR_T" :
 [ run no_wchar_t_pass.cpp ]
 [ compile-fail no_wchar_t_fail.cpp ] ;
 
-
-
diff --git a/test/config_info.cpp b/test/config_info.cpp
index afc83aaa..35a05fd0 100644
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@@ -1017,6 +1017,7 @@ void print_boost_macros()
 
 
 
+
    // END GENERATED BLOCK
 
    PRINT_MACRO(BOOST_INTEL);
diff --git a/test/config_test.cpp b/test/config_test.cpp
index ec94a206..9361d6f9 100644
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -1,17 +1,19 @@
-//  This file was automatically generated on Sat Aug 25 12:32:22 2007
+//  This file was automatically generated on Fri Oct 19 13:34:11 2007
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-4.
 //  Use, modification and distribution are subject to the 
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-//  See http://www.boost.org/libs/config for the most recent version.
+//  See http://www.boost.org/libs/config for the most recent version.//
+//  Revision $Id$
+//
+
 // Test file for config setup
 // This file should compile, if it does not then
 // one or more macros need to be defined.
 // see boost_*.ipp for more details
 
-
 // Do not edit this file, it was generated automatically by
 
 #include <boost/config.hpp>
@@ -1147,4 +1149,3 @@ int main( int, char *[] )
    return error_count;
 }
 
-
diff --git a/test/math_info.cpp b/test/math_info.cpp
index d5188650..e06c7454 100644
--- a/test/math_info.cpp
+++ b/test/math_info.cpp
@@ -280,6 +280,12 @@ int main()
       "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
       "Macros from <math.h>" << std::endl;
 
+#ifdef __BORLANDC__
+   // Turn off hardware exceptions so we don't just abort 
+   // when calling numeric_limits members.
+   _control87(MCW_EM,MCW_EM);
+#endif
+
    PRINT_EXPRESSION(HUGE_VAL);
 #ifdef HUGE_VALF
    PRINT_EXPRESSION(HUGE_VALF);
diff --git a/tools/generate.cpp b/tools/generate.cpp
index ddfdae1f..384ce6f7 100644
--- a/tools/generate.cpp
+++ b/tools/generate.cpp
@@ -30,7 +30,8 @@ std::string copyright(
 "//  Boost Software License, Version 1.0. (See accompanying file \n"
 "//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\n"
 "\n"
-"//  See http://www.boost.org/libs/config for the most recent version.");
+"//  See http://www.boost.org/libs/config for the most recent version."
+"//\n//  Revision $Id$\n//\n");
 
 std::stringstream config_test1;
 std::stringstream config_test1a;
@@ -128,9 +129,9 @@ void write_jamfile_v2()
       "path-constant DOT : . ;\n"
       "include $(DOT)/options_v2.jam ;\n\n"
       "run config_info.cpp ;\n"
-      "run math_info.cpp : : : <toolset>borland:<runtime-link>static ;\n"
+      "run math_info.cpp : : : <toolset>borland:<runtime-link>static <toolset>borland:<link>static ;\n"
       "run config_test.cpp ;\n"
-      "run limits_test.cpp ;\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;