diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 17bf40cab7c..38366f19021 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-20  Benjamin Kosnik  <bkoz@redhat.com>
+	    Uros Bizjak  <ubizjak@gmail.com>
+
+	PR libstdc++/38834
+	* config/abi/pre/gnu.ver: Correct char16_t and char32_t exports.
+	* config/os/gnu-linux/ldbl-extra.ver: Tweak.
+
 2009-01-20  Benjamin Kosnik  <bkoz@redhat.com>
             Rainer Emrich  <r.emrich@de.tecosim.com>
 
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index d73b5ec1c92..40237a6a854 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -403,8 +403,7 @@ GLIBCXX_3.4 {
     _ZNKSt9money_putI[cw]St19ostreambuf_iteratorI[cw]St11char_traitsI[cw]EEE*;
 
     # std::numeric_limits
-    # _ZNSt14numeric_limitsI[^g]*;
-    _ZNSt14numeric_limitsI[a-z]E*;
+    _ZNSt14numeric_limitsI[^g]E*;
 
     # std::_Rb_tree
     _ZSt18_Rb_tree_decrementPKSt18_Rb_tree_node_base;
@@ -931,7 +930,8 @@ GLIBCXX_3.4.11 {
     _ZSt20__throw_system_errori;
 
     # char16_t and char32_t
-    _ZNSt14numeric_limitsIu8char*;
+    _ZNSt14numeric_limitsIDiE*;
+    _ZNSt14numeric_limitsIDsE*;
 
     # chrono
     _ZNSt6chrono12system_clock12is_monotonicE;
diff --git a/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver b/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver
index 0d634e83bab..3dd0336306c 100644
--- a/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver
+++ b/libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver
@@ -1,7 +1,7 @@
 # Appended to version file.
 
 GLIBCXX_LDBL_3.4 {
-  _ZNSt14numeric_limitsIg*;
+  _ZNSt14numeric_limitsIgE*;
   _ZNSirsERg;
   _ZNSolsEg;
   _ZNSt13basic_istreamIwSt11char_traitsIwEErsERg;