diff --git a/test/all/Jamfile.v2 b/test/all/Jamfile.v2
index 3811fbe6..cd761fb5 100644
--- a/test/all/Jamfile.v2
+++ b/test/all/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 Thu Sep 18 23:32:18 2008
+# This file was automatically generated on Sat Sep 20 09:49:52 2008
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
diff --git a/test/boost_no_nested_friendship.ipp b/test/boost_no_nested_friendship.ipp
new file mode 100644
index 00000000..eb726509
--- /dev/null
+++ b/test/boost_no_nested_friendship.ipp
@@ -0,0 +1,21 @@
+//  MACRO:         BOOST_NO_NESTED_FRIENDSHIP
+//  TITLE:         Access to private members from nested classes
+//  DESCRIPTION:   If the compiler fails to support access to private members
+//                 from nested classes
+
+namespace boost_no_nested_friendship {
+
+class A {
+   static int b;
+   class B {
+      int f() { return b; }
+   };
+};
+
+int test()
+{
+    return 0;
+}
+
+}
+
diff --git a/test/config_info.cpp b/test/config_info.cpp
index 3cc329b0..87b9aa9a 100644
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@@ -1038,6 +1038,7 @@ void print_boost_macros()
 
 
 
+
 
 
    // END GENERATED BLOCK
diff --git a/test/config_test.cpp b/test/config_test.cpp
index 6fbedf8c..876cd37c 100644
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Thu Sep 18 23:32:18 2008
+//  This file was automatically generated on Sat Sep 20 09:49:52 2008
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-4.
 //  Use, modification and distribution are subject to the 
diff --git a/test/no_nested_friendship_fail.cpp b/test/no_nested_friendship_fail.cpp
new file mode 100644
index 00000000..dd90e404
--- /dev/null
+++ b/test/no_nested_friendship_fail.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Thu Sep 18 23:32:18 2008
+//  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.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_NESTED_FRIENDSHIP
+// This file should not compile, if it does then
+// BOOST_NO_NESTED_FRIENDSHIP should not be defined.
+// See file boost_no_nested_friendship.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifdef BOOST_NO_NESTED_FRIENDSHIP
+#include "boost_no_nested_friendship.ipp"
+#else
+#error "this file should not compile"
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_nested_friendship::test();
+}
+
diff --git a/test/no_nested_friendship_pass.cpp b/test/no_nested_friendship_pass.cpp
new file mode 100644
index 00000000..3e114bc9
--- /dev/null
+++ b/test/no_nested_friendship_pass.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Thu Sep 18 23:32:18 2008
+//  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.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_NESTED_FRIENDSHIP
+// This file should compile, if it does not then
+// BOOST_NO_NESTED_FRIENDSHIP should be defined.
+// See file boost_no_nested_friendship.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifndef BOOST_NO_NESTED_FRIENDSHIP
+#include "boost_no_nested_friendship.ipp"
+#else
+namespace boost_no_nested_friendship = empty_boost;
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_nested_friendship::test();
+}
+
diff --git a/test/no_typename_with_ctor_fail.cpp b/test/no_typename_with_ctor_fail.cpp
new file mode 100644
index 00000000..74ee7b0e
--- /dev/null
+++ b/test/no_typename_with_ctor_fail.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Thu Sep 18 23:32:18 2008
+//  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.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_TYPENAME_WITH_CTOR
+// This file should not compile, if it does then
+// BOOST_NO_TYPENAME_WITH_CTOR should not be defined.
+// See file boost_no_typename_with_ctor.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifdef BOOST_NO_TYPENAME_WITH_CTOR
+#include "boost_no_typename_with_ctor.ipp"
+#else
+#error "this file should not compile"
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_typename_with_ctor::test();
+}
+
diff --git a/test/no_typename_with_ctor_pass.cpp b/test/no_typename_with_ctor_pass.cpp
new file mode 100644
index 00000000..4a2d9bbc
--- /dev/null
+++ b/test/no_typename_with_ctor_pass.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Thu Sep 18 23:32:18 2008
+//  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.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_TYPENAME_WITH_CTOR
+// This file should compile, if it does not then
+// BOOST_NO_TYPENAME_WITH_CTOR should be defined.
+// See file boost_no_typename_with_ctor.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include <boost/config.hpp>
+#include "test.hpp"
+
+#ifndef BOOST_NO_TYPENAME_WITH_CTOR
+#include "boost_no_typename_with_ctor.ipp"
+#else
+namespace boost_no_typename_with_ctor = empty_boost;
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_typename_with_ctor::test();
+}
+