diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 15ee8aceb8e..647b0415737 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-12  Mark Kettenis  <kettenis@gnu.org>
 
+	* arm-tdep.c (set_disassembly_style, _initialize_arm_tdep):
+	Consitify regnames.
+
 	* alpha-tdep.c (alpha_sigtramp_frame_prev_register)
 	(alpha_heuristic_frame_prev_register): Change type of last
 	argument to `gdb_byte *'.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 339205ee06c..69547898514 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2481,7 +2481,7 @@ arm_register_name (int i)
 static void
 set_disassembly_style (void)
 {
-  const char *setname, *setdesc, **regnames;
+  const char *setname, *setdesc, *const *regnames;
   int numregs, j;
 
   /* Find the style that the user wants in the opcodes table.  */
@@ -2875,7 +2875,7 @@ _initialize_arm_tdep (void)
   struct cmd_list_element *new_set, *new_show;
   const char *setname;
   const char *setdesc;
-  const char **regnames;
+  const char *const *regnames;
   int numregs, i, j;
   static char *helptext;
   char regdesc[1024], *rdptr = regdesc;