diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 466885aae42..fafb938690a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-22  Andrew Cagney  <cagney@redhat.com>
+
+	* osabi.c (generic_elf_osabi_sniff_abi_tag_sections): Handle
+	GNU_ABI_TAG_FREEBSD and GNU_ABI_TAG_NETBSD.  Suggested by Momchil
+	Velikov.
+
 2003-06-22  Daniel Jacobowitz  <drow@mvista.com>
 
 	* cli/cli-cmds.c (shell_escape): Silence warnings from old
diff --git a/gdb/osabi.c b/gdb/osabi.c
index 5f935d2dfe7..252129ba7f2 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -384,6 +384,14 @@ generic_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect, void *obj)
 	      *os_ident_ptr = GDB_OSABI_SOLARIS;
 	      break;
 
+	    case GNU_ABI_TAG_FREEBSD:
+	      *os_ident_ptr = GDB_OSABI_FREEBSD_ELF;
+	      break;
+	      
+	    case GNU_ABI_TAG_NETBSD:
+	      *os_ident_ptr = GDB_OSABI_NETBSD_ELF;
+	      break;
+	      
 	    default:
 	      internal_error
 		(__FILE__, __LINE__,