diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3115aa7f1..cccf1286a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -104,6 +104,7 @@ Gerrit Riessen
 Glenn McAllister
 Glenn Twiggs
 Greg Nelson
+Günther Kögel
 Harish Prabandham
 Haroon Rafique
 Hiroaki Nakamura
diff --git a/WHATSNEW b/WHATSNEW
index ea770fbda..a1b7e2b2f 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -253,6 +253,10 @@ Fixed bugs:
    fails).
    Bugzilla Report 45028.
 
+ * the Unix "ant" wrapper script failed to protect wildcards in
+   command line arguments in some cases.
+   Bugzilla Report 31601.
+
 Other changes:
 --------------
 
diff --git a/contributors.xml b/contributors.xml
index 648e1ff34..c7fc71ce7 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -441,6 +441,10 @@
     <first>Greg</first>
     <last>Nelson</last>
   </name>
+  <name>
+    <first>Günther</first>
+    <last>Kögel</last>
+  </name>
   <name>
     <first>Harish</first>
     <last>Prabandham</last>
diff --git a/src/script/ant b/src/script/ant
index 07ecccfbb..0dc22fe0b 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -319,8 +319,8 @@ else
     ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
   fi
 fi
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\""
 if $ant_exec_debug ; then
-    echo $ant_exec_command
+    echo $ant_exec_command $ant_exec_args
 fi
-eval $ant_exec_command
+eval $ant_exec_command "$ant_exec_args"