diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7978e34bcba..563b632303d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2005-12-26  Mark Kettenis  <kettenis@gnu.org>
 
+	* sparcobsd-tdep.c: Include "obsd-tdep.h".
+	(sparc32obsd_init_abi): Set skip_solib_resolver.
+	* Makefile.in (sparcobsd-tdep.o): Update dependencies.
+	* config/sparc/obsd.mt (TDEPFILES): Add obsd-tdep.o.
+
 	* obsd-tdep.c: New file.
 	* obsd-tdep.h: New file.
 	* Makefile.in (obsd_tdep_h): New variable.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e2db4a1940e..69a35afc4cc 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2631,7 +2631,7 @@ sparcnbsd-tdep.o: sparcnbsd-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \
 	$(gdb_string_h) $(sparc_tdep_h) $(nbsd_tdep_h)
 sparcobsd-tdep.o: sparcobsd-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \
 	$(frame_unwind_h) $(osabi_h) $(solib_svr4_h) $(symtab_h) \
-	$(trad_frame_h) $(gdb_assert_h) $(sparc_tdep_h)
+	$(trad_frame_h) $(gdb_assert_h) $(obsd_tdep_h) $(sparc_tdep_h)
 sparc-sol2-nat.o: sparc-sol2-nat.c $(defs_h) $(regcache_h) $(gregset_h) \
 	$(sparc_tdep_h) $(sparc64_tdep_h)
 sparc-sol2-tdep.o: sparc-sol2-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
diff --git a/gdb/config/sparc/obsd.mt b/gdb/config/sparc/obsd.mt
index cadef2866cd..8b31aa6df4e 100644
--- a/gdb/config/sparc/obsd.mt
+++ b/gdb/config/sparc/obsd.mt
@@ -1,3 +1,3 @@
 # Target: OpenBSD/sparc
 TDEPFILES= sparc-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o nbsd-tdep.o \
-	corelow.o solib.o solib-svr4.o
+	obsd-tdep.o corelow.o solib.o solib-svr4.o
diff --git a/gdb/sparcobsd-tdep.c b/gdb/sparcobsd-tdep.c
index 36795345b8e..88e4a78f3fc 100644
--- a/gdb/sparcobsd-tdep.c
+++ b/gdb/sparcobsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for OpenBSD/sparc.
 
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -30,6 +30,7 @@
 
 #include "gdb_assert.h"
 
+#include "obsd-tdep.h"
 #include "sparc-tdep.h"
 
 /* Signal trampolines.  */
@@ -150,6 +151,8 @@ sparc32obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   /* OpenBSD/sparc is very similar to NetBSD/sparc ELF.  */
   sparc32nbsd_elf_init_abi (info, gdbarch);
 
+  set_gdbarch_skip_solib_resolver (gdbarch, obsd_skip_solib_resolver);
+
   frame_unwind_append_sniffer (gdbarch, sparc32obsd_sigtramp_frame_sniffer);
 }