diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 97a170a5842..e0eebb2214e 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-options.c (sim_parse_args): Tweak getopt error message.
+
 2016-01-04  Mike Frysinger  <vapier@gentoo.org>
 
 	* acinclude.m4 (sim-bswap): Delete.
diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c
index f662b734cfb..ad8b1eb29b8 100644
--- a/sim/common/sim-options.c
+++ b/sim/common/sim-options.c
@@ -616,7 +616,7 @@ sim_parse_args (SIM_DESC sd, char **argv)
 	    badopt = argv[optind - 1];
 
 	  sim_io_eprintf (sd,
-			  "%s: unrecognized option: %s\n"
+			  "%s: unrecognized option '%s'\n"
 			  "Use --help for a complete list of options.\n",
 			  STATE_MY_NAME (sd), badopt);
 
diff --git a/sim/testsuite/sim/cris/ChangeLog b/sim/testsuite/sim/cris/ChangeLog
index fa348635378..76dcec50ea8 100644
--- a/sim/testsuite/sim/cris/ChangeLog
+++ b/sim/testsuite/sim/cris/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* asm/opterr1.ms: Update expected output.
+	* asm/opterr2.ms: Likewise.
+
 2015-12-25  Mike Frysinger  <vapier@gentoo.org>
 
 	* asm/io1.ms: Update expected output.
diff --git a/sim/testsuite/sim/cris/asm/opterr1.ms b/sim/testsuite/sim/cris/asm/opterr1.ms
index 94118db620c..409f58b0c9d 100644
--- a/sim/testsuite/sim/cris/asm/opterr1.ms
+++ b/sim/testsuite/sim/cris/asm/opterr1.ms
@@ -1,5 +1,5 @@
 # mach: crisv3 crisv8 crisv10 crisv32
 # xerror:
-# output: *: unrecognized option [`']--cris-stats=xyz'\n
+# output: *: unrecognized option [`']--cris-stats=xyz'\nUse --help for a complete list of options.\n
 # sim: --cris-stats=xyz
  .include "nopv32t.ms"
diff --git a/sim/testsuite/sim/cris/asm/opterr2.ms b/sim/testsuite/sim/cris/asm/opterr2.ms
index 129ad1d8d61..084d61ec58e 100644
--- a/sim/testsuite/sim/cris/asm/opterr2.ms
+++ b/sim/testsuite/sim/cris/asm/opterr2.ms
@@ -1,5 +1,5 @@
 # mach: crisv3 crisv8 crisv10 crisv32
 # xerror:
-# output: *: unrecognized option [`']--cris-xyz'\n
+# output: *: unrecognized option [`']--cris-xyz'\nUse --help for a complete list of options.\n
 # sim: --cris-xyz
  .include "nopv32t.ms"