diff --git a/include/ChangeLog b/include/ChangeLog
index f448555417e..438a7703fad 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* demangle.h (demangler_engine): Constify.
+
 Thu May  4 17:15:26 2000  Philippe De Muyter  <phdm@macqel.be>
 
 	* sort.h (sys/types.h): File included unconditionnaly.
diff --git a/include/demangle.h b/include/demangle.h
index 2ebc2a5043f..dd0d9fcac03 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -83,9 +83,9 @@ extern enum demangling_styles
 
 extern struct demangler_engine
 {
-  char *demangling_style_name;
+  const char *demangling_style_name;
   enum demangling_styles demangling_style;
-  char *demangling_style_doc;
+  const char *demangling_style_doc;
 } libiberty_demanglers[];
 
 extern char *
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 7dc83320d23..a0db63fecc4 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cplus-dem.c (cplus_demangle_opname, demangle_function_name):
+	Cast the arguments to `islower' to `unsigned char'.
+	(print_demangler_list): Prototype.
+
 Thu May  4 17:14:41 2000  Philippe De Muyter  <phdm@macqel.be>
 
 	* sort.c (UCHAR_MAX): Provide fallback definition.
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 4ea2c958329..9ccce64e655 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -679,8 +679,8 @@ cplus_demangle_opname (opname, result, options)
 	}
     }
   else if (opname[0] == '_' && opname[1] == '_'
-	   && islower(opname[2])
-	   && islower(opname[3]))
+	   && islower((unsigned char)opname[2])
+	   && islower((unsigned char)opname[3]))
     {
       if (opname[4] == '\0')
 	{
@@ -4266,8 +4266,8 @@ demangle_function_name (work, mangled, declp, scan)
 	}
     }
   else if (declp->b[0] == '_' && declp->b[1] == '_'
-	   && islower(declp->b[2])
-	   && islower(declp->b[3]))
+	   && islower((unsigned char)declp->b[2])
+	   && islower((unsigned char)declp->b[3]))
     {
       if (declp->b[4] == '\0')
 	{
@@ -4480,6 +4480,7 @@ static int flags = DMGL_PARAMS | DMGL_ANSI;
 static void demangle_it PARAMS ((char *));
 static void usage PARAMS ((FILE *, int)) ATTRIBUTE_NORETURN;
 static void fatal PARAMS ((const char *)) ATTRIBUTE_NORETURN;
+static void print_demangler_list PARAMS ((FILE *));
 
 static void
 demangle_it (mangled_name)