diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fbd45e6ca8c7e86e43a71b731ce5ac03e6650be9..5ad3dd54e227899e373c6a29c1f213310247cc8a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-14  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* include/bits/ptr_traits.h (pointer_traits<T*>::pointer_to): Use
+	noexcept.
+
 2011-06-14  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/std/valarray (~valarray): Use noexcept.
@@ -44,6 +49,13 @@
 	Likewise.
 	* testsuite/23_containers/deque/debug/shrink_to_fit.cc: Likewise.
 
+2011-06-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+	* testsuite/tr1/6_containers/tuple/creation_functions/tie2.cc: Fix for
+	C++0x mode.
+	* testsuite/25_algorithms/sort/35588.cc: Likewise.
+	* testsuite/26_numerics/headers/complex/synopsis.cc: Likewise.
+
 2011-06-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	* include/ext/extptr_allocator.h (construct, destroy): Fix for C++0x
diff --git a/libstdc++-v3/include/bits/ptr_traits.h b/libstdc++-v3/include/bits/ptr_traits.h
index c83beadb149527dcbd490c576ae8304165b155dc..a4dae82524e025446f1a4e619b7492c04a905dc2 100644
--- a/libstdc++-v3/include/bits/ptr_traits.h
+++ b/libstdc++-v3/include/bits/ptr_traits.h
@@ -211,7 +211,7 @@ _GLIBCXX_HAS_NESTED_TYPE(difference_type)
        *  @return @c addressof(r)
       */
       static pointer
-      pointer_to(typename __ptrtr_not_void<element_type>::__type& __r)
+      pointer_to(typename __ptrtr_not_void<element_type>::__type& __r) noexcept
       { return std::addressof(__r); }
     };