diff --git a/include/boost/config/stdlib/libstdcpp3.hpp b/include/boost/config/stdlib/libstdcpp3.hpp
index 2a54fd18..52d58373 100644
--- a/include/boost/config/stdlib/libstdcpp3.hpp
+++ b/include/boost/config/stdlib/libstdcpp3.hpp
@@ -139,11 +139,15 @@
 #  define BOOST_NO_0X_HDR_RANDOM
 #endif
 
+//  C++0x features in GCC 4.5.0 and later
+//
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
+#  define BOOST_NO_0X_HDR_TYPEINDEX
+#endif
 //  C++0x headers not yet (fully!) implemented
 //
 #  define BOOST_NO_0X_HDR_THREAD
 #  define BOOST_NO_0X_HDR_TYPE_TRAITS
 #  define BOOST_NO_0X_HDR_CODECVT
-#  define BOOST_NO_0X_HDR_TYPEINDEX
 
 //  --- end ---
diff --git a/test/boost_no_constexpr.ipp b/test/boost_no_constexpr.ipp
index 0143f55c..c246e234 100644
--- a/test/boost_no_constexpr.ipp
+++ b/test/boost_no_constexpr.ipp
@@ -32,7 +32,7 @@ template<int> struct X { };
 
 constexpr A a = 42;
 
-X<a> x; // OK: unique conversion to int
+X<a> xx; // OK: unique conversion to int
 
 int test()
 {