diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cd1dcf8991..910379bacb 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Wed May  4 02:56:00 1994  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
+
+	* config.bfd (i386-*-gnu*): Treat like i386-*-mach*.
+	(m68*-apollo-*): Treat all Apollo configs the same, don't handle
+	BSD specially.
+
 Tue May  3 19:43:21 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* cache.c: Rewrote to work correctly.
diff --git a/bfd/config.bfd b/bfd/config.bfd
index dc901e8e34..13473f5933 100755
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -44,6 +44,7 @@ case "${canon}" in
   i[34]86-*-netware*)	bfd_name=i386-nlm ;;
   i[34]86-*-linux*)	bfd_name=i386-linux ;;
   i[34]86-*-lynxos*)	bfd_name=i386-lynx ;;
+  i[34]86-*-gnu*)	bfd_name=i386-mach3 ;;
   i[34]86-*-mach*)	bfd_name=i386-mach3 ;;
   i[34]86-*-osf1mk*)	bfd_name=i386-mach3 ;;
   i[34]86-*-os9k)	bfd_name=i386-os9k;;
@@ -56,7 +57,7 @@ case "${canon}" in
   i960-*-bout*)		bfd_name=i960-bout ;;
   i960-*-coff*)		bfd_name=i960-coff ;;
   i960-*-nindy*)	bfd_name=i960-bout ;;
-  m68*-apollo-bsd*)	bfd_name=apollo ;;
+  m68*-apollo-*)	bfd_name=apollo ;;
   m68*-bull-sysv*)	bfd_name=u68k-coff ;;
   m68*-hp-bsd*)		bfd_name=hp300bsd ;;
   m68*-*-aout*)		bfd_name=m68k-aout ;;