diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index af116537a9..7137fe173b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-26  Mark Kettenis  <kettenis@gnu.org>
+
+	* configure.tgt (*-*-freebsd*): Set gdb_osabi to
+	GDB_OSABI_FREEBSD_ELF.  Partial fix for PR gdb/1922.
+
 2005-04-26  Andrew Cagney  <cagney@gnu.org>
 
 	* remote.c (remote_open_1): Move "ex"'s declaration to where it is
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 41c94d06c7..2af2fc5112 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -210,6 +210,7 @@ esac
 # map target onto default OS ABI
 
 case "${target}" in
+*-*-freebsd*)	gdb_osabi=GDB_OSABI_FREEBSD_ELF ;;
 *-*-linux*)	gdb_osabi=GDB_OSABI_LINUX ;;
 *-*-nto*)	gdb_osabi=GDB_OSABI_QNXNTO ;;
 m68*-*-openbsd* | m88*-*-openbsd* | vax-*-openbsd*) ;;