diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b92c95f1a2a..4f84eaa5837 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-19  Benjamin Kosnik  <bkoz@redhat.com>
+	
+	* config/linker-map.gnu: Export global vtable, typeinfo, guard
+	variable, and thunk info as per CXXABI docs.
+
 2002-02-19  Loren Rittle <ljrittle@acm.org>
 
 	* include/Makefile.am: Use CONFIG_HEADER instead of ad hoc names.
diff --git a/libstdc++-v3/config/linker-map.gnu b/libstdc++-v3/config/linker-map.gnu
index 315293fd7aa..6c5b5ff3f2f 100644
--- a/libstdc++-v3/config/linker-map.gnu
+++ b/libstdc++-v3/config/linker-map.gnu
@@ -37,10 +37,6 @@ GLIBCPP_3.1 {
     };
 
     ## Names not in an 'extern' block are mangled names.
-    __cxa_*;
-    __gxx_personality_v0;
-    __dynamic_cast;
-
     ## operator new(unsigned)
     _Znwj;
 
@@ -54,16 +50,26 @@ GLIBCPP_3.1 {
     _ZdaPv;
 
     # vtable	
-    # XXX export them all?
-    _ZTVSt*;  
-    _ZTVN10__cxxabiv1*;
+    _ZTV*;  
+    _ZTT*;
 
     # typeinfo
-    # XXX export them all?
-    _ZTSSt*;
+    _ZTI*;
+    _ZTS*;
 
+    # function-scope static objects requires a guard variable.
+    _ZGV*;
+
+    # virtual function thunks
+    _ZTh*;
+    _ZTv*;
+    _ZTc*;
+
+    # XXX
+    __cxa_*;
+    __gxx_personality_v0;
+    __dynamic_cast;
 
-######## hmmmmm, the rediculous hacks section....
     ## std::_S_rb_tree_red
     _ZSt14_S_rb_tree_red;
 
@@ -76,12 +82,6 @@ GLIBCPP_3.1 {
     ## std::__stl_chunk_size
     _ZSt16__stl_chunk_size;
 
-    ## VTT for std::basic_istringstream<char, std::char_traits<char>, std::allocator<char> >
-    _ZTTSt19basic_istringstreamIcSt11char_traitsIcESaIcEE;
-
-    ## VTT for std::basic_ostringstream<char, std::char_traits<char>, std::allocator<char> >
-    _ZTTSt19basic_ostringstreamIcSt11char_traitsIcESaIcEE;
-
     # this is a function, "void std::__convert_to_v(stuff)", and as such
     # doesn't work well in the demangled section above
     _ZSt14__convert_to_v*;