diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 82c2cba49ae..d7768f24895 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-11  Gabriel Dos Reis  <gdr@codesourcery.com>
+
+	* include/bits/char_traits.h char_traits<char>::int_type: Change
+	to `int' to match 21.1.3.1/2.
+
+	* testsuite/21_strings/char_traits-int_type.C: New test.
+
 2001-02-10  Gabriel Dos Reis  <gdr@codesourcery.com>
 
 	* testsuite/Makefile.am: New file.
diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h
index 4d7833240ea..caa90e985f9 100644
--- a/libstdc++-v3/include/bits/char_traits.h
+++ b/libstdc++-v3/include/bits/char_traits.h
@@ -150,7 +150,7 @@ namespace std {
     struct char_traits<char>
     {
       typedef char 		char_type;
-      typedef unsigned int 	int_type;
+      typedef int 	        int_type;
       typedef streampos 	pos_type;
       typedef streamoff 	off_type;
       typedef mbstate_t 	state_type;
diff --git a/libstdc++-v3/testsuite/21_strings/char_traits-int_type.C b/libstdc++-v3/testsuite/21_strings/char_traits-int_type.C
new file mode 100644
index 00000000000..40b05a9c36c
--- /dev/null
+++ b/libstdc++-v3/testsuite/21_strings/char_traits-int_type.C
@@ -0,0 +1,33 @@
+// 2001-02-11 gdr
+// Origin: Craig Rodrigues <rodrigc@mediaone.net>
+
+// Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// 21.1.3.1/2: char_traits<char>::int_type == int
+
+#include <string>
+
+int main()
+{
+  // dg-options -ansi -pedantic-errors
+  std::char_traits<char>::int_type* p = 0;
+  int* q = p;                   // dg-do compile
+
+  return 0;
+}