diff --git a/ChangeLog b/ChangeLog
index ab60c3f73..becbc7762 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-18  Peter Stephenson  <pws@csr.com>
+
+	* 20033: Completion/Base/Utility/_arguments: unconfirmed fix
+	for configure output parsing with square brackets.
+
 2004-06-17  Oliver Kiddle  <opk@zsh.org>
 
 	* 20069: Completion/Unix/Command/_iconv: complete character
diff --git a/Completion/Base/Utility/_arguments b/Completion/Base/Utility/_arguments
index 44be6db84..05a287a5f 100644
--- a/Completion/Base/Utility/_arguments
+++ b/Completion/Base/Utility/_arguments
@@ -67,9 +67,9 @@ if (( long )); then
     # those hyphens and anything from the space or tab after the
     # option up to the end.
 
-    lopts=("--${(@)^${(@)${(@)${(@M)${(@ps:\n:j:\n:)${(@)${(@M)${(@f)$(_call_program options ${~words[1]} --help 2>&1)//\[--/
+    lopts=("--${(@)${(@)^${(@)${(@)${(@M)${(@ps:\n:j:\n:)${(@)${(@M)${(@f)$(_call_program options ${~words[1]} --help 2>&1)//\[--/
 --}:#[ 	]#-*}//,/
-}}:#[ 	]#--*}#*--}%%[]	 ]*}:#}")
+}}:#[ 	]#--*}#*--}%%[]	 ]*}:#}//\[=/=}")
 
     # Remove options also described by user-defined specs.