diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 19ee5c470c..b2db9d5b1d 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-03  Mike Stump  <mikestump@comcast.net>
+
+	* sim-options.c (complete_option_list): Mark text and word const.
+
 2013-06-28  Tom Tromey  <tromey@redhat.com>
 
 	* Make-common.in (version.c): Use version.in, not
diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c
index fdc05a4a0e..170548b5ee 100644
--- a/sim/common/sim-options.c
+++ b/sim/common/sim-options.c
@@ -920,7 +920,7 @@ find_match (SIM_DESC sd, sim_cpu *cpu, char *argv[], int *pargi)
 
 static char **
 complete_option_list (char **ret, size_t *cnt, const struct option_list *ol,
-		      char *text, char *word)
+		      const char *text, const char *word)
 {
   const OPTION *opt = NULL;
   int argi;