diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6d6241322408e67cae6b02f0f5418f61da92dd77..9987e3fa86994f7180bb63727e8d11f41059afe5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2001-08-10  Gabriel Dos Reis  <gdr@merlin.codesourcery.com>
+
+	* include/bits/std_limits.h(__glibcpp_char_is_signed): Use
+	__CHAR_UNSIGNED__.
+
+	* config/os/gnu-linux/bits/os_defines.h(__glibcpp_char_is_signed):
+	Likewise. 
+	* config/os/aix/bits/os_defines.h(__glibcpp_plain_char_is_signed): 
+	Remove.
+
 2001-08-10  Loren J. Rittle  <ljrittle@acm.org>
 
 	* testsuite/testsuite_hooks.h (__set_testsuite_memlimit): Add
@@ -8,7 +18,7 @@
 	colon in $(objdir).
 	* include/Makefile.in: Rebuilt.
 
-2001-08-10   Gunter Winkler gunter.winkler@mathematik.tu-chemnitz.de
+2001-08-10   Gunter Winkler <gunter.winkler@mathematik.tu-chemnitz.de>
 
 	* include/bits/std_complex.h (complex<long double>::operator*=,
  	complex<long double>::operator/=): Fix thinko.
diff --git a/libstdc++-v3/config/os/aix/bits/os_defines.h b/libstdc++-v3/config/os/aix/bits/os_defines.h
index 91e1fd6958f878142b9691401a121158ce8a06bb..101a0b26f8632b64a225541293bc58d5c2e232d1 100644
--- a/libstdc++-v3/config/os/aix/bits/os_defines.h
+++ b/libstdc++-v3/config/os/aix/bits/os_defines.h
@@ -55,7 +55,6 @@
 #undef _G_USING_THUNKS
 #define _G_USING_THUNKS 0
 
-#define __glibcpp_plain_char_is_signed false
 #define __glibcpp_long_double_bits 64
 
 #if !defined(_AIX51) || !defined(__64BIT__)
diff --git a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
index 1441b0a4eb0422c8f9d5c3e57473077eb142c632..63082ebeb9a47037e86a5600a94e650c65bc9a79 100644
--- a/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
+++ b/libstdc++-v3/config/os/gnu-linux/bits/os_defines.h
@@ -64,7 +64,6 @@ typedef __loff_t __off64_t;
 # endif
 
 #if defined (__powerpc__) || defined (__s390__) || defined (__s390x__)
-#define __glibcpp_plain_char_is_signed false
 #define __glibcpp_wchar_t_is_signed true
 #endif
 
diff --git a/libstdc++-v3/include/bits/std_limits.h b/libstdc++-v3/include/bits/std_limits.h
index 6c0e5d6521a1e245cd29c8d23828913ea4f5793d..53d339e44a4cc447f109870a3ffb49faa0e6000d 100644
--- a/libstdc++-v3/include/bits/std_limits.h
+++ b/libstdc++-v3/include/bits/std_limits.h
@@ -77,7 +77,9 @@
 #ifndef __glibcpp_char_bits
 #define __glibcpp_char_bits 8
 #endif
-#ifndef __glibcpp_plain_char_is_signed
+#ifndef __CHAR_UNSIGNED__
+#define __glibcpp_plain_char_is_signed false
+#else
 #define __glibcpp_plain_char_is_signed true
 #endif
 #ifndef __glibcpp_short_bits