diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b3a706fa44b..d3c763e3401 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-27  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/13884
+	* include/bits/sstream.tcc: Guard use of extern template.
+	
 2004-01-27  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/basic_string.tcc
diff --git a/libstdc++-v3/include/bits/sstream.tcc b/libstdc++-v3/include/bits/sstream.tcc
index 07e13926ba9..b3db928a054 100644
--- a/libstdc++-v3/include/bits/sstream.tcc
+++ b/libstdc++-v3/include/bits/sstream.tcc
@@ -205,6 +205,7 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.  
   // NB:  This syntax is a GNU extension.
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class basic_stringbuf<char>;
   extern template class basic_istringstream<char>;
   extern template class basic_ostringstream<char>;
@@ -216,6 +217,7 @@ namespace std
   extern template class basic_ostringstream<wchar_t>;
   extern template class basic_stringstream<wchar_t>;
 #endif
+#endif
 } // namespace std
 
 #endif