diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3e9aad7d32d..9986596b767 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 23 00:57:05 2000  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.in (i386-*-freebsd a.out entry): Quote properly.
+
 2000-05-23  Alan Modra  <alan@linuxcare.com.au>
 
 	* config/tc-i386.c (md_assemble): Pass jump reloc in fr_var...
diff --git a/gas/configure b/gas/configure
index 828f9c0ffa3..0187718c1e9 100755
--- a/gas/configure
+++ b/gas/configure
@@ -1766,7 +1766,7 @@ for this_target in $target $canon_targets ; do
       i386-*-lynxos*)       fmt=coff em=lynx ;;
       i386-*-sysv4* | i386-*-solaris* | i386-*-elf)
 			    fmt=elf bfd_gas=yes ;;
-      i386-*-freebsdaout* | i386-*-freebsd12.* | i386-*-freebsd12)
+      i386-*-freebsdaout* | i386-*-freebsd[12].* | i386-*-freebsd[12])
                             fmt=aout em=386bsd ;;
       i386-*-freebsd*)	    fmt=elf bfd_gas=yes ;;
       i386-*-coff | i386-*-sysv* | i386-*-sco3.2v5*coff | i386-*-isc*)
diff --git a/gas/configure.in b/gas/configure.in
index 895b425032d..3da7fcb6168 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -229,8 +229,10 @@ changequote([,])dnl
       i386-*-lynxos*)       fmt=coff em=lynx ;;
       i386-*-sysv4* | i386-*-solaris* | i386-*-elf)
 			    fmt=elf bfd_gas=yes ;;
+changequote(,)dnl
       i386-*-freebsdaout* | i386-*-freebsd[12].* | i386-*-freebsd[12])
                             fmt=aout em=386bsd ;;
+changequote([,])dnl
       i386-*-freebsd*)	    fmt=elf bfd_gas=yes ;;
       i386-*-coff | i386-*-sysv* | i386-*-sco3.2v5*coff | i386-*-isc*)
                           fmt=coff ;;