diff --git a/gas/ChangeLog b/gas/ChangeLog
index 57290b5a02d..f9f4cae70c7 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-04  Eric Christopher  <echristo@redhat.com>
+
+	* doc/c-mips.texi (MIPS Opts): Document 12000 as valid cpu.
+
+	* config/tc-mips.c (mips_cpu_info_table): Add rm5200, rm5231, rm5261,
+	and rm5721 as valid cpu strings.
+	(md_show_usage): Add rm5200, rm5231, rm5261, rm5721.
+
 2001-07-04  Richard Sandiford  <rsandifo@redhat.com>
 
 	* config/tc-mips.c (md_apply_fix): Prevent addend from becoming zero
@@ -14,7 +22,7 @@
         called.
 
         * doc/internals.texi; Document
-	TC_FINALIZE_SYMS_BEFORE_SIZE_SEG. 
+	TC_FINALIZE_SYMS_BEFORE_SIZE_SEG.
 
 2001-07-02  Alan Modra  <amodra@bigpond.net.au>
 
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 064a2704c33..d1e6e9f2ca0 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -9339,6 +9339,11 @@ MIPS options:\n\
   show (stream, "4600", &column, &first);
   show (stream, "4650", &column, &first);
   show (stream, "5000", &column, &first);
+  show (stream, "5200", &column, &first);
+  show (stream, "5230", &column, &first);
+  show (stream, "5231", &column, &first);
+  show (stream, "5261", &column, &first);
+  show (stream, "5721", &column, &first);
   show (stream, "6000", &column, &first);
   show (stream, "8000", &column, &first);
   show (stream, "10000", &column, &first);
@@ -12170,10 +12175,15 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
   { "mips64vr5000",   0,      ISA_MIPS4,      CPU_R5000, },
   { "r5000",          0,      ISA_MIPS4,      CPU_R5000, },
   { "r5200",          0,      ISA_MIPS4,      CPU_R5000, },
+  { "rm5200",         0,      ISA_MIPS4,      CPU_R5000, },
   { "r5230",          0,      ISA_MIPS4,      CPU_R5000, },
+  { "rm5230",         0,      ISA_MIPS4,      CPU_R5000, },
   { "r5231",          0,      ISA_MIPS4,      CPU_R5000, },
+  { "rm5231",         0,      ISA_MIPS4,      CPU_R5000, },
   { "r5261",          0,      ISA_MIPS4,      CPU_R5000, },
+  { "rm5261",         0,      ISA_MIPS4,      CPU_R5000, },
   { "r5721",          0,      ISA_MIPS4,      CPU_R5000, },
+  { "rm5721",         0,      ISA_MIPS4,      CPU_R5000, },
   { "r5k",            0,      ISA_MIPS4,      CPU_R5000, },
   { "r7000",          0,      ISA_MIPS4,      CPU_R5000, },
 
diff --git a/gas/doc/c-mips.texi b/gas/doc/c-mips.texi
index 177e5980d32..87d5d2f3d59 100644
--- a/gas/doc/c-mips.texi
+++ b/gas/doc/c-mips.texi
@@ -148,6 +148,7 @@ rm5721,
 rm7000,
 8000,
 10000,
+12000,
 mips32-4k,
 sb1
 @end quotation