diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d658649025..3017fd0da0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-24  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* cli/cli-setshow.c (do_set_command): Constify p.
+
 2015-10-24  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* nat/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Replace
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 1ffb80b4a6..74d2d007e3 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -361,7 +361,7 @@ do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
 	int len;
 	int nmatches;
 	const char *match = NULL;
-	char *p;
+	const char *p;
 
 	/* If no argument was supplied, print an informative error
 	   message.  */