diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c3adf21c1c..484efb4a03 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-23  Mark Kettenis  <kettenis@gnu.org>
+
+	* NEWS (New native configurations): Mention OpenBSD/sparc and
+	OpenBSD/sparc64.
+	* configure.tgt: Add sparc-*-openbsd* and sparc64-*-openbsd*.
+	* configure.host: Likewise.
+	* sparcnbsd-tdep.c (_initialize_sparnbsd_tdep): Register OS ABI
+	handler for OpenBSD.
+	* sparc64nbsd-tdep.c (_initialize_sparc64nbsd_tdep): Likewise.
+
 2004-01-22  Mark Kettenis  <kettenis@gnu.org>
 
 	* sparcnbsd-tdep.c (sparcnbsd_core_osabi_sniffer): New function.
diff --git a/gdb/NEWS b/gdb/NEWS
index 71f45c3c01..f24f592db5 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -37,6 +37,8 @@ encountered these.
 * New native configurations
 
 NetBSD/amd64					x86_64-*-netbsd*
+OpenBSD/sparc					sparc-*-openbsd*
+OpenBSD/sparc64					sparc64-*-openbsd*
 
 * New debugging protocols
 
diff --git a/gdb/configure.host b/gdb/configure.host
index 6f28482101..a61de2a0f9 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -132,6 +132,8 @@ sparc-*-netbsdelf*)	gdb_host=nbsdelf ;;
 sparc-*-netbsdaout*)	gdb_host=nbsdaout ;;
 sparc-*-netbsd*)	gdb_host=nbsdaout ;;
 sparc64-*-netbsd*)	gdb_host=nbsd64 ;;
+sparc-*-openbsd*)	gdb_host=nbsdelf ;;
+sparc64-*-openbsd*)	gdb_host=nbsd64 ;;
 sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
 			gdb_host=sol2
 			;;
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index f974631569..d57018b57f 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -190,6 +190,8 @@ sparc-*-linux*)		gdb_target=linux ;;
 sparc64-*-linux*)	gdb_target=linux64 ;;
 sparc-*-netbsd*)	gdb_target=nbsd ;;
 sparc64-*-netbsd*)	gdb_target=nbsd64 ;;
+sparc-*-openbsd*)	gdb_target=nbsd ;;
+sparc64-*-openbsd*)	gdb_target=nbsd64 ;;
 sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
 			gdb_target=sol2
 			;;
diff --git a/gdb/sparc64nbsd-tdep.c b/gdb/sparc64nbsd-tdep.c
index 58b87b3d59..dccb3a1810 100644
--- a/gdb/sparc64nbsd-tdep.c
+++ b/gdb/sparc64nbsd-tdep.c
@@ -243,4 +243,6 @@ _initialize_sparc64nbsd_tdep (void)
 {
   gdbarch_register_osabi (bfd_arch_sparc, bfd_mach_sparc_v9,
 			  GDB_OSABI_NETBSD_ELF, sparc64nbsd_init_abi);
+  gdbarch_register_osabi (bfd_arch_sparc, bfd_mach_sparc_v9,
+			  GDB_OSABI_OPENBSD_ELF, sparc64nbsd_init_abi);
 }
diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c
index 80e3db5a67..2547405ac5 100644
--- a/gdb/sparcnbsd-tdep.c
+++ b/gdb/sparcnbsd-tdep.c
@@ -312,4 +312,6 @@ _initialize_sparnbsd_tdep (void)
 			  sparc32nbsd_aout_init_abi);
   gdbarch_register_osabi (bfd_arch_sparc, 0, GDB_OSABI_NETBSD_ELF,
 			  sparc32nbsd_elf_init_abi);
+  gdbarch_register_osabi (bfd_arch_sparc, 0, GDB_OSABI_OPENBSD_ELF,
+			  sparc32nbsd_elf_init_abi);
 }