diff --git a/gas/ChangeLog b/gas/ChangeLog
index e1ba472bdb..fbab72c968 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-03  Thiemo Seufer  <ths@mips.com>
+
+	* config/tc-mips.c (mips_cpu_info_table): The 25Kf is a MIPS64
+	release 1 CPU.
+
 2006-11-03  Jakub Jelinek  <jakub@redhat.com>
 
 	* dw2gencfi.c (struct fde_entry): Add per_encoding, lsda_encoding,
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 0a8c48d374..4eca5bb81e 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -14594,9 +14594,9 @@ static const struct mips_cpu_info mips_cpu_info_table[] =
   { "5kc",            0,			ISA_MIPS64,	CPU_MIPS64 },
   { "5kf",            0,			ISA_MIPS64,	CPU_MIPS64 },
   { "20kc",           MIPS_CPU_ASE_MIPS3D,	ISA_MIPS64,	CPU_MIPS64 },
+  { "25kf",           MIPS_CPU_ASE_MIPS3D,	ISA_MIPS64,     CPU_MIPS64 },
 
   /* MIPS 64 Release 2 */
-  { "25kf",           MIPS_CPU_ASE_MIPS3D,	ISA_MIPS64R2,   CPU_MIPS64R2 },
 
   /* Broadcom SB-1 CPU core */
   { "sb1",            MIPS_CPU_ASE_MIPS3D | MIPS_CPU_ASE_MDMX,