diff --git a/gas/ChangeLog b/gas/ChangeLog
index 907d592cbbb..161bb379b4b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-27  Aldy Hernandez  <aldyh@redhat.com>
+
+        * config/tc-arm.c (psrs): Remove lowercase versions of spsr* and
+        cpsr*.
+        (arm_psr_parse): Handle lowercase CPSR and SPSR.
+
 2000-10-25  Nick Clifton  <nickc@redhat.com>
 
 	* dwarf2out.c (dwarf2_generate_asm_lineno): New function: Generate
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index d7a38481129..fd83a42af70 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -562,20 +562,6 @@ static CONST struct asm_psr psrs[] =
   {"SPSR_csxf",	false, PSR_c | PSR_s | PSR_x | PSR_f},
   {"SPSR_cxfs",	false, PSR_c | PSR_x | PSR_f | PSR_s},
   {"SPSR_cxsf",	false, PSR_c | PSR_x | PSR_s | PSR_f},
-  /* For backwards compatability with older toolchain we also
-     support lower case versions of some of these flags.  */
-  {"cpsr",	true,  PSR_c | PSR_f},
-  {"cpsr_all",	true,  PSR_c | PSR_f},
-  {"spsr",	false, PSR_c | PSR_f},
-  {"spsr_all",	false, PSR_c | PSR_f},
-  {"cpsr_flg",	true,  PSR_f},
-  {"cpsr_f",    true,  PSR_f},
-  {"spsr_flg",	false, PSR_f},
-  {"spsr_f",    false, PSR_f},
-  {"cpsr_c",	true,  PSR_c},
-  {"cpsr_ctl",	true,  PSR_c},
-  {"spsr_c",	false, PSR_c},
-  {"spsr_ctl",	false, PSR_c}
 };
 
 /* Functions called by parser.  */
@@ -1773,6 +1759,13 @@ arm_psr_parse (ccp)
   /* Terminate the word.  */
   *--p = 0;
 
+  /* CPSR's and SPSR's can now be lowercase.  This is just a convenience
+     feature for ease of use and backwards compatibility.  */
+  if (!strncmp (start, "cpsr", 4))
+    strncpy (start, "CPSR", 4);
+  else if (!strncmp (start, "spsr", 4))
+    strncpy (start, "SPSR", 4);
+
   /* Now locate the word in the psr hash table.  */
   psr = (CONST struct asm_psr *) hash_find (arm_psr_hsh, start);