diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0e21cc7cc62..9f6c755cd6a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-02  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/bits/c++config: Add tr2 to versioned namespaces.
+	* scripts/run_doxygen: Adjust generated man files as well.
+	* testsuite/ext/profile/mutex_extensions_neg.cc: Adjust line numbers.
+
 2011-11-02  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	* include/std/future (promise): Add constructors for uses-allocator
@@ -18,7 +24,7 @@
 
 	* acinclude.m4 (GLIBCXX_CONFIGURE): Refer to GNU/Linux.
 	* configure: Regenerate.
-	
+
 2011-10-31  Jason Merrill  <jason@redhat.com>
 
 	PR c++/50920
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index f77da5ee1a7..e76e7423021 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -148,6 +148,8 @@
       namespace __detail { }
     }
 
+    namespace tr2 { }
+    
     namespace decimal { }
 
     namespace chrono { }
@@ -197,6 +199,9 @@ namespace std
     namespace __detail { inline namespace __7 { } }
   }
 
+  namespace tr2
+  { inline namespace __7 { } }
+
   namespace decimal { inline namespace __7 { } }
 
   namespace chrono { inline namespace __7 { } }
diff --git a/libstdc++-v3/scripts/run_doxygen b/libstdc++-v3/scripts/run_doxygen
index 48b17249737..3fef95f83fb 100644
--- a/libstdc++-v3/scripts/run_doxygen
+++ b/libstdc++-v3/scripts/run_doxygen
@@ -339,6 +339,10 @@ for f in std_tr1_*; do
     newname=`echo $f | sed 's/^std_tr1_/std::tr1::/'`
     mv $f $newname
 done
+for f in std_tr2_*; do
+    newname=`echo $f | sed 's/^std_tr2_/std::tr2::/'`
+    mv $f $newname
+done
 for f in std_*; do
     newname=`echo $f | sed 's/^std_/std::/'`
     mv $f $newname
diff --git a/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
index 4e2d071b833..c6e6feac6c0 100644
--- a/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
+++ b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc
@@ -25,4 +25,4 @@
 
 #include <vector>
 
-// { dg-error "multiple inlined namespaces" "" { target *-*-* } 258 }
+// { dg-error "multiple inlined namespaces" "" { target *-*-* } 263 }