diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 039560109c5..8926b933fc8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
 2017-05-16  Jonathan Wakely  <jwakely@redhat.com>
 
+	PR libstdc++/80285
+	* include/bits/shared_ptr_base.h [!__cpp_rtti] (type_info): Declare
+	outside versioned namespace.
+
 	* configure: Regenerate.
 
 2017-05-16  Marc Glisse  <marc.glisse@inria.fr>
diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h
index 69185794a85..b4a5edfdf43 100644
--- a/libstdc++-v3/include/bits/shared_ptr_base.h
+++ b/libstdc++-v3/include/bits/shared_ptr_base.h
@@ -59,6 +59,10 @@
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
+#if !__cpp_rtti
+  class type_info;
+#endif
+
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 #if _GLIBCXX_USE_DEPRECATED
@@ -68,10 +72,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #pragma GCC diagnostic pop
 #endif
 
-#if !__cpp_rtti
-  class type_info;
-#endif
-
  /**
    *  @brief  Exception possibly thrown by @c shared_ptr.
    *  @ingroup exceptions