diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index d78a86a358567f4d29b660e71ad8799805f12a5f..f0d9395719f7cc024f604eba15b05da5bf4042a0 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-16  Dave Pitts  <dpitts@cozx.com>
+
+	* cplus-dem.c (cplus_demangle_opname): Changed to use islower.
+ 
 2000-04-05  Richard Henderson  <rth@cygnus.com>
 
 	* splay-tree.c (splay_tree_remove): New.
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 52249d2b580c6d3809b1367ec51f15e089b81f86..0c49c55ff6ef88f43ab837076f204ee26e441566 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -636,8 +636,8 @@ cplus_demangle_opname (opname, result, options)
 	}
     }
   else if (opname[0] == '_' && opname[1] == '_'
-	   && opname[2] >= 'a' && opname[2] <= 'z'
-	   && opname[3] >= 'a' && opname[3] <= 'z')
+	   && islower(opname[2])
+	   && islower(opname[3]))
     {
       if (opname[4] == '\0')
 	{
@@ -4188,8 +4188,8 @@ demangle_function_name (work, mangled, declp, scan)
 	}
     }
   else if (declp->b[0] == '_' && declp->b[1] == '_'
-	   && declp->b[2] >= 'a' && declp->b[2] <= 'z'
-	   && declp->b[3] >= 'a' && declp->b[3] <= 'z')
+	   && islower(declp->b[2])
+	   && islower(declp->b[3]))
     {
       if (declp->b[4] == '\0')
 	{