diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0572f17e1e4..39e973c9420 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-20  François Dumont  <fdumont@gcc.gnu.org>
+
+	* include/bits/c++config: inline __cxx11 namespace within namespace
+	__cxx1998.
+
 2014-12-20  Jonathan Wakely  <jwakely@redhat.com>
 
 	* src/c++98/locale-inst.cc (__add_grouping, __pad, __int_to_char):
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index cffb065ce18..ec7414dfd27 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -277,9 +277,13 @@ namespace std
   // Non-inline namespace for components replaced by alternates in active mode.
   namespace __cxx1998
   {
-#if _GLIBCXX_INLINE_VERSION
- inline namespace __7 { }
-#endif
+# if _GLIBCXX_INLINE_VERSION
+  inline namespace __7 { }
+# endif
+
+# if _GLIBCXX_USE_CXX11_ABI
+  inline namespace __cxx11 __attribute__((abi_tag)) { }
+# endif
   }
 
   // Inline namespace for debug mode.