diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 15aca3cc76..111826667c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-19  Mark Kettenis  <kettenis@gnu.org>
 
+	* alphaobsd-tdep.c: Include "obsd-tdep.h".
+	(alphaobsd_init_abi): Set skip_solib_resolver.
+	* Makefile.in (alphaobsd-tdep.o): Update dependencies.
+	* config/alpha/obsd.mt (TDEPFILES): Add obsd-tdep.o.
+
 	* arm-tdep.c (arm_gdbarch_init): Get default floating-point model
 	from ELF flags for binaries produced by the GNU toolchain.
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5bd3ffd097..f6f24b7943 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1712,7 +1712,8 @@ alphanbsd-tdep.o: alphanbsd-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \
 	$(gdb_assert_h) $(alpha_tdep_h) $(alphabsd_tdep_h) $(nbsd_tdep_h) \
 	$(solib_svr4_h)
 alphaobsd-tdep.o: alphaobsd-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \
-	$(osabi_h) $(alpha_tdep_h) $(alphabsd_tdep_h) $(solib_svr4_h)
+	$(osabi_h) $(obsd_tdep_h) $(alpha_tdep_h) $(alphabsd_tdep_h) \
+	$(solib_svr4_h)
 alpha-osf1-tdep.o: alpha-osf1-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \
 	$(value_h) $(osabi_h) $(gdb_string_h) $(objfiles_h) $(alpha_tdep_h)
 alpha-tdep.o: alpha-tdep.c $(defs_h) $(doublest_h) $(frame_h) \
diff --git a/gdb/alphaobsd-tdep.c b/gdb/alphaobsd-tdep.c
index ad0360e607..58b4f8aa2b 100644
--- a/gdb/alphaobsd-tdep.c
+++ b/gdb/alphaobsd-tdep.c
@@ -24,6 +24,7 @@
 #include "gdbcore.h"
 #include "osabi.h"
 
+#include "obsd-tdep.h"
 #include "alpha-tdep.h"
 #include "alphabsd-tdep.h"
 #include "solib-svr4.h"
@@ -111,6 +112,7 @@ alphaobsd_init_abi(struct gdbarch_info info, struct gdbarch *gdbarch)
   /* OpenBSD/alpha has SVR4-style shared libraries.  */
   set_solib_svr4_fetch_link_map_offsets
     (gdbarch, svr4_lp64_fetch_link_map_offsets);
+  set_gdbarch_skip_solib_resolver (gdbarch, obsd_skip_solib_resolver);
 
   tdep->dynamic_sigtramp_offset = alphaobsd_sigtramp_offset;
   tdep->pc_in_sigtramp = alphaobsd_pc_in_sigtramp;
diff --git a/gdb/config/alpha/obsd.mt b/gdb/config/alpha/obsd.mt
index 16f79e1ea4..093d50c875 100644
--- a/gdb/config/alpha/obsd.mt
+++ b/gdb/config/alpha/obsd.mt
@@ -1,4 +1,4 @@
 # Target: OpenBSD/alpha
-TDEPFILES= alpha-tdep.o alpha-mdebug-tdep.o \
-	alphabsd-tdep.o alphanbsd-tdep.o alphaobsd-tdep.o nbsd-tdep.o \
+TDEPFILES= alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o \
+	alphanbsd-tdep.o alphaobsd-tdep.o nbsd-tdep.o obsd-tdep.o \
 	corelow.o solib.o solib-svr4.o