diff --git a/gas/ChangeLog b/gas/ChangeLog
index 34bd68fbd0..2bc26284e2 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/obj-elf.c (obj_elf_parse_section_letters): Use 'M' instead
+	of 'm', 'S' instead of 's'.  Update bad_msg.
+	* config/tc-ppc.c (ppc_section_letter): Update bad_msg.
+	* config/tc-i370.c (i370_sectioN_letter): Update bad_msg.
+
 2001-09-09  Alan Modra  <amodra@bigpond.net.au>
 
 	* expr.c (expr): Move code setting "retval" to the end of the loop,
diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
index 4f4e8d4c5d..efde9c1299 100644
--- a/gas/config/obj-elf.c
+++ b/gas/config/obj-elf.c
@@ -750,15 +750,15 @@ obj_elf_parse_section_letters (str, len)
 	case 'x':
 	  attr |= SHF_EXECINSTR;
 	  break;
-	case 'm':
+	case 'M':
 	  attr |= SHF_MERGE;
 	  break;
-	case 's':
+	case 'S':
 	  attr |= SHF_STRINGS;
 	  break;
 	default:
 	  {
-	    char *bad_msg = _("Unrecognized .section attribute: want a,m,s,w,x");
+	    char *bad_msg = _("Unrecognized .section attribute: want a,w,x,M,S");
 #ifdef md_elf_section_letter
 	    int md_attr = md_elf_section_letter (*str, &bad_msg);
 	    if (md_attr >= 0)
diff --git a/gas/config/tc-i370.c b/gas/config/tc-i370.c
index affc9575fd..75a5792368 100644
--- a/gas/config/tc-i370.c
+++ b/gas/config/tc-i370.c
@@ -2462,7 +2462,7 @@ i370_section_letter (letter, ptr_msg)
   if (letter == 'e')
     return SHF_EXCLUDE;
 
-  *ptr_msg = "Bad .section directive: want a,w,x,e in string";
+  *ptr_msg = "Bad .section directive: want a,e,w,x,M,S in string";
   return 0;
 }
 
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index a0f18d586d..f06bb58c0e 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -2440,7 +2440,7 @@ ppc_section_letter (letter, ptr_msg)
   if (letter == 'e')
     return SHF_EXCLUDE;
 
-  *ptr_msg = _("Bad .section directive: want a,w,x,e in string");
+  *ptr_msg = _("Bad .section directive: want a,e,w,x,M,S in string");
   return 0;
 }