diff --git a/ChangeLog b/ChangeLog
index 99b0472b30ff5ca63d79f7fdd047f96345786fdf..33885fffc1030eb3b51a4ab1ebf153a516f50fb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* config-ml.in: Alter CCASFLAGS to include special
+	multilib options the same as is done for CFLAGS.
+
 2006-06-12  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* configure.in: Don't enable libgomp on hpux10.
@@ -2090,7 +2095,7 @@
 	of libf2c.
 	* configure, Makefile.in: Regenerate.
 
-2004-05-13  Tobias Schlüter  <tobi@gcc.gnu.org>
+2004-05-13  Tobias Schlüter  <tobi@gcc.gnu.org>
 
 	* MAINTAINERS (Write After Approval): Add myself.
 
diff --git a/config-ml.in b/config-ml.in
index efec5a364c7d53a70cf081926b31faa69c67fe5a..4082fe45d3d70c1aa353c2071c633da574addfda 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -108,11 +108,6 @@ ml_realsrcdir=${srcdir}
 ml_verbose=--verbose
 for option in ${ac_configure_args}
 do
-  # strip single quotes surrounding individual options
-  case $option in
-  \'*\') eval option=$option ;;
-  esac
-
   case $option in
   --*) ;;
   -*) option=-$option ;;
@@ -551,6 +546,7 @@ multi-do:
 		flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
 		if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
 				CFLAGS="$(CFLAGS) $${flags}" \
+				CCASFLAGS="$(CCASFLAGS) $${flags}" \
 				FCFLAGS="$(FCFLAGS) $${flags}" \
 				FFLAGS="$(FFLAGS) $${flags}" \
 				ADAFLAGS="$(ADAFLAGS) $${flags}" \