diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 27189d6bc1f..0c8b184a744 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-17  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/tr1/cmath: Guard special math with
+	__GXX_EXPERIMENTAL_CXX0X__.
+	* testsuite/26_numerics/headers/cmath/types_std_c++0x_neg.cc:
+	Remove xfail.
+
 2007-05-17  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/locale_facets.tcc (__pad<>::_S_pad): Minor tweaks, avoid
diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cmath
index 36845bb124f..f1cb1e658f7 100644
--- a/libstdc++-v3/include/tr1/cmath
+++ b/libstdc++-v3/include/tr1/cmath
@@ -943,12 +943,13 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
 _GLIBCXX_END_NAMESPACE
 }
 
-  /**
-   * @defgroup tr1_math_spec_func Mathematical Special Functions
-   * A collection of advanced mathematical special functions.
-   * @{
-   */
 
+/**
+ * @defgroup tr1_math_spec_func Mathematical Special Functions
+ * A collection of advanced mathematical special functions.
+ * @{
+ */
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
 #include <tr1/gamma.tcc>
 #include <tr1/bessel_function.tcc>
 #include <tr1/beta_function.tcc>
@@ -1409,4 +1410,6 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
 _GLIBCXX_END_NAMESPACE
 }
 
+#endif // __GXX_EXPERIMENTAL_CXX0X__
+
 #endif
diff --git a/libstdc++-v3/testsuite/26_numerics/headers/cmath/types_std_c++0x_neg.cc b/libstdc++-v3/testsuite/26_numerics/headers/cmath/types_std_c++0x_neg.cc
index afa75f7f7d5..78343129fb2 100644
--- a/libstdc++-v3/testsuite/26_numerics/headers/cmath/types_std_c++0x_neg.cc
+++ b/libstdc++-v3/testsuite/26_numerics/headers/cmath/types_std_c++0x_neg.cc
@@ -49,26 +49,26 @@ namespace gnu
   using std::sph_neumann;
 }
 
-// { dg-error "has not been declared" "" { xfail *-*-* } 27 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 28 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 29 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 30 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 31 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 32 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 33 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 34 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 35 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 36 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 37 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 38 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 39 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 40 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 41 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 42 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 43 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 44 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 45 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 46 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 47 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 48 } 
-// { dg-error "has not been declared" "" { xfail *-*-* } 49 } 
+// { dg-error "has not been declared" "" { target *-*-* } 27 } 
+// { dg-error "has not been declared" "" { target *-*-* } 28 } 
+// { dg-error "has not been declared" "" { target *-*-* } 29 } 
+// { dg-error "has not been declared" "" { target *-*-* } 30 } 
+// { dg-error "has not been declared" "" { target *-*-* } 31 } 
+// { dg-error "has not been declared" "" { target *-*-* } 32 } 
+// { dg-error "has not been declared" "" { target *-*-* } 33 } 
+// { dg-error "has not been declared" "" { target *-*-* } 34 } 
+// { dg-error "has not been declared" "" { target *-*-* } 35 } 
+// { dg-error "has not been declared" "" { target *-*-* } 36 } 
+// { dg-error "has not been declared" "" { target *-*-* } 37 } 
+// { dg-error "has not been declared" "" { target *-*-* } 38 } 
+// { dg-error "has not been declared" "" { target *-*-* } 39 } 
+// { dg-error "has not been declared" "" { target *-*-* } 40 } 
+// { dg-error "has not been declared" "" { target *-*-* } 41 } 
+// { dg-error "has not been declared" "" { target *-*-* } 42 } 
+// { dg-error "has not been declared" "" { target *-*-* } 43 } 
+// { dg-error "has not been declared" "" { target *-*-* } 44 } 
+// { dg-error "has not been declared" "" { target *-*-* } 45 } 
+// { dg-error "has not been declared" "" { target *-*-* } 46 } 
+// { dg-error "has not been declared" "" { target *-*-* } 47 } 
+// { dg-error "has not been declared" "" { target *-*-* } 48 } 
+// { dg-error "has not been declared" "" { target *-*-* } 49 }