diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 58ed25737e3..8753df301cf 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-07  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/abi/pre/gnu.ver: Move <system_error> related
+	symbols to GLIBCXX_3.4.11 symbol version.
+	* testsuite/util/testsuite_abi.cc (check_version): Allow
+	GLIBCXX_3.4.11.
+
 2008-03-06  Chris Jefferson  <chris@bubblescope.net>
 	    Paolo Carlini  <pcarlini@suse.de>
 
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 3bcbde317c8..0b093a6ce9c 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -753,19 +753,6 @@ GLIBCXX_3.4.10 {
 
     _ZNK11__gnu_debug16_Error_formatter17_M_get_max_lengthEv;
 
-    # system_error
-    _ZSt15system_category;
-
-    _ZTISt14error_category;
-    _ZTSSt14error_category;
-    _ZTVSt14error_category;
-
-    _ZTSSt12system_error;
-    _ZTISt12system_error;
-    _ZTVSt12system_error;
-    _ZNSt12system_errorD*Ev;
-    _ZNSt12system_errorC*;
-
     _ZNKSt3tr14hashIRKSbIwSt11char_traitsIwESaIwEEEclES6_;
     _ZNKSt3tr14hashIRKSsEclES2_;
     _ZNKSt3tr14hashISbIwSt11char_traitsIwESaIwEEEclES4_;
@@ -776,7 +763,6 @@ GLIBCXX_3.4.10 {
     _ZNKSt4hashIRKSsEclES1_;
     _ZNKSt4hashISbIwSt11char_traitsIwESaIwEEEclES3_;
     _ZNKSt4hashISsEclESs;
-    _ZNKSt4hashISt10error_codeEclES0_;
     _ZNKSt4hashIeEclEe;
 
     _ZSt17__verify_grouping*;
@@ -802,6 +788,24 @@ GLIBCXX_3.4.10 {
 
 } GLIBCXX_3.4.9;
 
+GLIBCXX_3.4.11 {
+    # system_error
+    _ZSt15system_category;
+
+    _ZTISt14error_category;
+    _ZTSSt14error_category;
+    _ZTVSt14error_category;
+
+    _ZTSSt12system_error;
+    _ZTISt12system_error;
+    _ZTVSt12system_error;
+    _ZNSt12system_errorD*Ev;
+    _ZNSt12system_errorC*;
+
+    _ZNKSt4hashISt10error_codeEclES0_;
+
+} GLIBCXX_3.4.10;
+
 # Symbols in the support library (libsupc++) have their own tag.
 CXXABI_1.3 {
 
diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc
index 67c1e5294e9..93205b8cc67 100644
--- a/libstdc++-v3/testsuite/util/testsuite_abi.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc
@@ -192,6 +192,7 @@ check_version(symbol& test, bool added)
       known_versions.push_back("GLIBCXX_3.4.8");
       known_versions.push_back("GLIBCXX_3.4.9");
       known_versions.push_back("GLIBCXX_3.4.10");
+      known_versions.push_back("GLIBCXX_3.4.11");
       known_versions.push_back("GLIBCXX_LDBL_3.4");
       known_versions.push_back("GLIBCXX_LDBL_3.4.7");
       known_versions.push_back("GLIBCXX_LDBL_3.4.10");