diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2fcc943b829..c63cf2f9157 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-16  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* config/abi/pre/gnu.ver: Add base destructors for stdexcept classes.
+	* testsuite/19_diagnostics/stdexcept.cc: New.
+
 2011-03-15  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/std/thread: Revert.
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index f1c503441b9..f566efde754 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -1221,6 +1221,14 @@ GLIBCXX_3.4.15 {
     _ZNSt8__detail15_List_node_base11_M_transfer*;
     _ZNSt8__detail15_List_node_base4swapERS0_S1_;
 
+    _ZNSt11range_errorD2Ev;
+    _ZNSt12domain_errorD2Ev;
+    _ZNSt12length_errorD2Ev;
+    _ZNSt12out_of_rangeD2Ev;
+    _ZNSt14overflow_errorD2Ev;
+    _ZNSt15underflow_errorD2Ev;
+    _ZNSt16invalid_argumentD2Ev;
+
     _ZNSt11regex_errorD*;
     _ZNKSt11regex_error4whatEv;
     _ZTSSt11regex_error;
diff --git a/libstdc++-v3/testsuite/19_diagnostics/stdexcept.cc b/libstdc++-v3/testsuite/19_diagnostics/stdexcept.cc
new file mode 100644
index 00000000000..128f0a5b544
--- /dev/null
+++ b/libstdc++-v3/testsuite/19_diagnostics/stdexcept.cc
@@ -0,0 +1,228 @@
+// 2011-03-16 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2011
+// Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <string>
+#include <stdexcept>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+  std::string s("error");
+
+  try
+    {
+      logic_error e1(s);
+      throw e1;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      domain_error e2(s);
+      throw e2;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      invalid_argument e3(s);
+      throw e3;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      length_error e4(s);
+      throw e4;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      out_of_range e5(s);
+      throw e5;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      runtime_error e6(s);
+      throw e6;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      range_error e7(s);
+      throw e7;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      overflow_error e8(s);
+      throw e8;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      underflow_error e9(s);
+      throw e9;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+}
+
+template<typename _Tp>
+struct extra_error : public _Tp
+{
+  extra_error(const std::string& s) : _Tp(s) { }
+};
+
+void test02()
+{
+  using namespace std;
+  std::string s("error");
+
+  try
+    {
+      extra_error<logic_error> e1(s);
+      throw e1;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      extra_error<domain_error> e2(s);
+      throw e2;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      extra_error<invalid_argument> e3(s);
+      throw e3;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      extra_error<length_error> e4(s);
+      throw e4;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      extra_error<out_of_range> e5(s);
+      throw e5;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      extra_error<runtime_error> e6(s);
+      throw e6;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      extra_error<range_error> e7(s);
+      throw e7;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      extra_error<overflow_error> e8(s);
+      throw e8;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+
+  try
+    {
+      extra_error<underflow_error> e9(s);
+      throw e9;
+    }
+  catch(const exception& e)
+    {
+      s = e.what();
+    }
+}
+
+int main(void)
+{
+  test01();
+  test02();
+  return 0;
+}