diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9b534cb2832..2474a69e805 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,7 @@
 2019-10-02  Jonathan Wakely  <jwakely@redhat.com>
 
+	* config/abi/pre/gnu.ver: Tighten up greedy wildcards.
+
 	* doc/xml/manual/parallel_mode.xml: Add caveat about support for
 	recent standards.
 	* doc/html/*: Regenerate.
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 07a00036827..e61fbe0ad66 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -80,9 +80,8 @@ GLIBCXX_3.4 {
 #     std::domain_error::d*;
 #     std::domain_error::~d*;
       std::d[p-z]*;
-      std::e[a-q]*;
       std::error[^_]*;
-      std::e[s-z]*;
+      std::exception::*;
       std::gslice*;
       std::h[^a]*;
       std::i[a-m]*;