diff --git a/credits.txt b/credits.txt
index 12b7af733802565052202864ee435a1d88f0f02e..acd8becb5bc00acfd8554cd45a16fd60660795a7 100644
--- a/credits.txt
+++ b/credits.txt
@@ -5,6 +5,7 @@ the Apache Software Foundation.
 
 Nadav Aharoni
 Curt Arnold
+Edward Avis
 Anupam Bagchi
 Torbjörn Bäckström
 Matthew Baker
diff --git a/doc/feedback.xml b/doc/feedback.xml
index f09fae459faca14f27891284b9992e8880aac57f..f7aed2b2d84bfefa66af4e5fce7a0191970714ca 100644
--- a/doc/feedback.xml
+++ b/doc/feedback.xml
@@ -30,6 +30,7 @@
         <ul>
             <li>Nadav Aharoni</li>
             <li>Curt Arnold</li>
+            <li>Edward Avis</li>
             <li>Anupam Bagchi</li>
             <li>Torbjörn Bäckström</li>
             <li>Matthew Baker</li>
diff --git a/doc/releases.xml b/doc/releases.xml
index ddca04a4355d781827765dd7fef41cd9b5a0be93..10fdbed0cac7039a652035c4891769ecc35c0d30 100644
--- a/doc/releases.xml
+++ b/doc/releases.xml
@@ -61,6 +61,13 @@
         </td>
     </tr>
 
+    <tr>
+        <td>2001-12-05</td>
+        <td>Edward Avis</td>
+        <td>Fix runConfigure which can run into infinite loop with invalid argument
+        </td>
+    </tr>
+
     <tr>
         <td>2001-12-03</td>
         <td>Tinny Ng</td>
diff --git a/samples/runConfigure b/samples/runConfigure
index 445821c492bb11c61e2aa6a9e01d3fb42e074254..5d895f6dc7533f1aa5df195bf56826b411bc25b1 100755
--- a/samples/runConfigure
+++ b/samples/runConfigure
@@ -144,6 +144,11 @@ while [ $# -gt 0 ]
 
    --)
         shift; break;;
+
+   *)
+       echo "unknown option $1"
+       usage
+       exit ${ERROR_EXIT_CODE};;
    esac
 done
 
diff --git a/src/runConfigure b/src/runConfigure
index 86524dc988475cca86b7aaefadc99d01dd445ec8..dc5e182a93452e69760294497adcca10e96f0ab1 100755
--- a/src/runConfigure
+++ b/src/runConfigure
@@ -181,6 +181,11 @@ while [ $# -gt 0 ]
 
    --)
         shift; break;;
+
+   *)
+       echo "unknown option $1"
+       usage
+       exit ${ERROR_EXIT_CODE};;
    esac
 done
 
diff --git a/tests/runConfigure b/tests/runConfigure
index 250c8cdb0ed459e4e4c56b2a9dfa993c138afc02..01aafa9a81a0003ad0b53c6e4693d3e68769bc6c 100755
--- a/tests/runConfigure
+++ b/tests/runConfigure
@@ -58,6 +58,9 @@
 #
 #
 # $Log$
+# Revision 1.12  2001/12/05 16:49:53  tng
+# Fix runConfigure which can run into infinite loop with invalid argument  By Edward Avis.
+#
 # Revision 1.11  2001/11/23 16:17:46  tng
 # Remove -lC for Solaris build.
 #
@@ -173,6 +176,11 @@ for i in $*
 
    --)
         shift; break;;
+
+   *)
+       echo "unknown option $1"
+       usage
+       exit ${ERROR_EXIT_CODE};;
    esac
 done