diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a9470ca386..4a89da3684 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-12  Nigel Stephens  <nigel@mips.com>
+            Maciej W. Rozycki  <macro@mips.com>
+
+	* remote-mips.c (mips_load): Use regcache_set_valid_p() instead
+	of setting deprecated_register_valid array directly.
+
 2007-12-07  Maciej W. Rozycki  <macro@mips.com>
 
 	* mips-tdep.c (extended_offset): Fix a comment.
diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index ade658da74..b96ae2a85c 100644
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -3274,7 +3274,8 @@ mips_load (char *file, int from_tty)
       /* Work around problem where PMON monitor updates the PC after a load
          to a different value than GDB thinks it has. The following ensures
          that the write_pc() WILL update the PC value: */
-      deprecated_register_valid[gdbarch_pc_regnum (current_gdbarch)] = 0;
+      regcache_set_valid_p (get_current_regcache (),
+			    gdbarch_pc_regnum (current_gdbarch), 0);
     }
   if (exec_bfd)
     write_pc (bfd_get_start_address (exec_bfd));