diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4ff4dcb6d7..2b7a298477 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2004-03-05  Mark Kettenis  <kettenis@gnu.org>
 
+	* i386bsd-tdep.c (_initialize_i386bsd_tdep): Register
+	i386bsd_core_osabi_sniffer for bfd_arch_i386 instead of
+	bfd_arch_unknown.  Adjust comment.
+
 	* i386-nat.c: Fix typo in comment.  Re-introduce paranoiac.
 	* i386obsd-tdep.c: Correct spelling in comment.
 	* i386nbsd-tdep.c: Correct spelling in comment.
diff --git a/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c
index 9276c32b3f..c23acb53ac 100644
--- a/gdb/i386bsd-tdep.c
+++ b/gdb/i386bsd-tdep.c
@@ -163,8 +163,7 @@ _initialize_i386bsd_tdep (void)
   gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_aout_flavour,
 				  i386bsd_aout_osabi_sniffer);
 
-  /* BFD doesn't set the architecture for NetBSD style a.out core
-     files.  */
-  gdbarch_register_osabi_sniffer (bfd_arch_unknown, bfd_target_unknown_flavour,
+  /* BFD doesn't set a flavour for NetBSD style a.out core files.  */
+  gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_unknown_flavour,
 				  i386bsd_core_osabi_sniffer);
 }