diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7263ff84719..5e600e6fbb3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-20  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/debug/formatter.h: Use _Tp as template argument.
+	* src/debug.cc: Same, instantiate std::size_t.
+	
 2003-11-20  Benjamin Kosnik  <bkoz@redhat.com>
 
 	PR libstdc++/13109
diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h
index a6b3c770525..1a627a98dda 100644
--- a/libstdc++-v3/include/debug/formatter.h
+++ b/libstdc++-v3/include/debug/formatter.h
@@ -356,9 +356,9 @@ namespace __gnu_debug
       _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false)
     { }
 
-    template<typename _T>
+    template<typename _Tp>
       void
-      _M_format_word(char*, int, const char*, _T) const;
+      _M_format_word(char*, int, const char*, _Tp) const;
 
     void 
     _M_print_word(const char* __word) const;
diff --git a/libstdc++-v3/src/debug.cc b/libstdc++-v3/src/debug.cc
index a00a2508c3e..a78bdec2df3 100644
--- a/libstdc++-v3/src/debug.cc
+++ b/libstdc++-v3/src/debug.cc
@@ -496,11 +496,11 @@ namespace __gnu_debug
     abort();
   }
 
-  template<typename _T>
+  template<typename _Tp>
     void
     _Error_formatter::_M_format_word(char* __buf, 
 				     int __n __attribute__((__unused__)), 
-				     const char* __fmt, _T __s) const
+				     const char* __fmt, _Tp __s) const
     {
 #ifdef _GLIBCXX_USE_C99
       std::snprintf(__buf, __n, __fmt, __s);
@@ -651,7 +651,7 @@ namespace __gnu_debug
   template
     void
     _Error_formatter::_M_format_word(char* __buf, int __n, const char* __fmt, 
-				     unsigned int __s) const;
+				     std::size_t __s) const;
 
   template
     void