diff --git a/ChangeLog b/ChangeLog
index 09e69817..c511b594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-05  Gary V. Vaughan  <gary@gnu.org>
 
+	Add missing quote for literal ? in a shell case statement.
+	* libltdl/config/getopt.m4sh (m4go_shortnoargs): Quote initial ?
+	correctly for use in a shell case statement.
+
 	Quote command line arguments after --rcfile properly.
 	* libltdl/config/announce-gen.m4sh (--rcfile): Quote remaining
 	arguments shell variable expression correctly for eval.
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 74491d0c..a81a9053 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -135,7 +135,7 @@ m4_define([m4go_branches], [])	# case branches to process options
 # OPTION, [|])' to insert the separator pipe symbols - which requires
 # that `m4go_shortargs' be undefined if the first option appended is not
 # prefixed by a leading `|'.
-m4_define([m4go_shortnoargs], [-?*|-h*|-v*])
+m4_define([m4go_shortnoargs], [-\?*|-h*|-v*])
 
 
 # M4SH_GETOPTS(SHORT-SPEC1, LONG-MATCH1, DEF1, INIT1,