diff --git a/gas/ChangeLog b/gas/ChangeLog
index 83a9a026f2..22a056d8ed 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-07  David Ung  <davidu@mips.com>
+
+	* config/tc-mips.c (mips_cpu_info_table): Add cpu names m4k, 24k,
+	24kc, 24kf and 24kfx under MIPS32 release 2.
+
 2005-06-04  Nick Clifton  <nickc@redhat.com>
 
 	* config/tc-arm.c (CE, C3, CM, UE, UF): Redefine without reference
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index fb256e4ce4..2afebfb974 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -13778,6 +13778,13 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
   { "4km",            0,      ISA_MIPS32,     CPU_MIPS32 },
   { "4kp",            0,      ISA_MIPS32,     CPU_MIPS32 },
 
+  /* MIPS32 Release 2 */
+  { "m4k",            0,      ISA_MIPS32R2,   CPU_MIPS32R2 },
+  { "24k",            0,      ISA_MIPS32R2,   CPU_MIPS32R2 },
+  { "24kc",           0,      ISA_MIPS32R2,   CPU_MIPS32R2 },
+  { "24kf",           0,      ISA_MIPS32R2,   CPU_MIPS32R2 },
+  { "24kx",           0,      ISA_MIPS32R2,   CPU_MIPS32R2 },
+
   /* MIPS 64 */
   { "5kc",            0,      ISA_MIPS64,     CPU_MIPS64 },
   { "20kc",           0,      ISA_MIPS64,     CPU_MIPS64 },