diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b832f40eb05a..479eaa2b4545 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-24  Loren J. Rittle  <ljrittle@acm.org>
+
+        * config/generic/ctype.cc (do_toupper): Remove dependence on
+        non-portable/non-existent lookup table.
+        (do_tolower): Same.
+	
 2000-04-24  Nathan Myers  <ncm@cantrip.org>
 
 	* src/string-inst.cc: More fixing.
diff --git a/libstdc++-v3/config/generic/ctype.cc b/libstdc++-v3/config/generic/ctype.cc
index ad7ec434bc31..dd7fc1a77043 100644
--- a/libstdc++-v3/config/generic/ctype.cc
+++ b/libstdc++-v3/config/generic/ctype.cc
@@ -42,14 +42,14 @@
 
   char
   ctype<char>::do_toupper(char __c) const
-  { return _S_toupper[(int) __c]; }
+  { return toupper((int) __c); }
 
   const char*
   ctype<char>::do_toupper(char* __low, const char* __high) const
   {
     while (__low < __high)
       {
-	*__low = _S_toupper[(int) *__low];
+	*__low = toupper((int) *__low);
 	++__low;
       }
     return __high;
@@ -57,14 +57,14 @@
 
   char
   ctype<char>::do_tolower(char __c) const
-  { return _S_tolower[(int) __c]; }
+  { return tolower((int) __c); }
 
   const char* 
   ctype<char>::do_tolower(char* __low, const char* __high) const
   {
     while (__low < __high)
       {
-	*__low = _S_tolower[(int) *__low];
+	*__low = tolower((int) *__low);
 	++__low;
       }
     return __high;