diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e35d49b4851..b0c79b5653b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-24  Tom Tromey  <tromey@redhat.com>
+
+	* monitor.c (compile_pattern): Update.
+	* target.h (struct target_ops) <to_shortname, to_longname,
+	to_doc>: Now const.
+
 2014-07-24  Tom Tromey  <tromey@redhat.com>
 
 	* cli/cli-decode.c (add_cmd, add_prefix_cmd)
diff --git a/gdb/monitor.c b/gdb/monitor.c
index 788bca0b3b6..6767197ac61 100644
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -715,7 +715,7 @@ compile_pattern (char *pattern, struct re_pattern_buffer *compiled_pattern,
 void
 monitor_open (const char *args, struct monitor_ops *mon_ops, int from_tty)
 {
-  char *name;
+  const char *name;
   char **p;
   struct inferior *inf;
 
diff --git a/gdb/target.h b/gdb/target.h
index e4aade77e54..bcf97d9ab47 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -394,9 +394,9 @@ typedef void async_callback_ftype (enum inferior_event_type event_type,
 struct target_ops
   {
     struct target_ops *beneath;	/* To the target under this one.  */
-    char *to_shortname;		/* Name this target type */
-    char *to_longname;		/* Name for printing */
-    char *to_doc;		/* Documentation.  Does not include trailing
+    const char *to_shortname;	/* Name this target type */
+    const char *to_longname;	/* Name for printing */
+    const char *to_doc;		/* Documentation.  Does not include trailing
 				   newline, and starts with a one-line descrip-
 				   tion (probably similar to to_longname).  */
     /* Per-target scratch pad.  */