diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9817a2d91c..b8105b9186 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,16 @@
 2004-07-03  Mark Kettenis  <kettenis@gnu.org>
 
+	* m68kbsd-nat.c: Include "gdbcore.h", <sys/types.h>,
+	<machine/pcb.h> and "bsd-kvm.h".
+	(PCB_REGS_FP, PCB_REGS_SP): Define if not already defined.
+	(m68kbsd_supply_pcb): New function.
+	(_initialize_m68kbsd_nat): New prototype and function.
+	* Makefile.in (m68kbsd-nat.o): Update dependencies.
+	* config/m68k/nbsdelf.mh (NATDEPFILES): Add bsd-kvm.o.
+	(LOADLIBES): New variable.
+	* config/m68k/obsd.mh (NATDEPFILES): Add bsd-kvm.o.
+	(LOADLIBES): New variable.
+
 	* bsd-kvm.c (bsd_kvm_cmdlist): Remove unecessary initialization.
 
 2004-07-03  Mark Kettenis  <kettenis@gnu.org>
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 616fa96e2c..e8dc635df9 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2064,8 +2064,8 @@ m68klinux-tdep.o: m68klinux-tdep.c $(defs_h) $(gdbcore_h) $(doublest_h) \
 	$(floatformat_h) $(frame_h) $(target_h) $(gdb_string_h) \
 	$(gdbtypes_h) $(osabi_h) $(regcache_h) $(objfiles_h) $(symtab_h) \
 	$(m68k_tdep_h) $(trad_frame_h) $(frame_unwind_h)
-m68kbsd-nat.o: m68kbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
-	$(gdb_assert_h) $(m68k_tdep_h)
+m68kbsd-nat.o: m68kbsd-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) \
+	$(regcache_h) $(gdb_assert_h) $(m68k_tdep_h) $(bsd_kvm_h)
 m68kbsd-tdep.o: m68kbsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \
 	$(regcache_h) $(regset_h) $(gdb_assert_h) $(gdb_string_h) \
 	$(m68k_tdep_h) $(solib_svr4_h)
diff --git a/gdb/config/m68k/nbsdelf.mh b/gdb/config/m68k/nbsdelf.mh
index d15e132364..1823f32c0c 100644
--- a/gdb/config/m68k/nbsdelf.mh
+++ b/gdb/config/m68k/nbsdelf.mh
@@ -1,3 +1,5 @@
 # Host: NetBSD/m68k ELF
-NATDEPFILES= m68kbsd-nat.o fork-child.o infptrace.o inftarg.o
+NATDEPFILES= m68kbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o
 NAT_FILE= nm-nbsd.h
+
+LOADLIBES= -lkvm
\ No newline at end of file
diff --git a/gdb/config/m68k/obsd.mh b/gdb/config/m68k/obsd.mh
index e188538708..54e4e9d7c2 100644
--- a/gdb/config/m68k/obsd.mh
+++ b/gdb/config/m68k/obsd.mh
@@ -1,4 +1,6 @@
 # Host: OpenBSD/m68k
-NATDEPFILES= m68kbsd-nat.o fork-child.o infptrace.o inftarg.o \
+NATDEPFILES= m68kbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o \
 	solib.o solib-sunos.o
 NAT_FILE= nm-nbsdaout.h
+
+LOADLIBES= -lkvm
diff --git a/gdb/m68kbsd-nat.c b/gdb/m68kbsd-nat.c
index 8ee8a60f0a..285c149428 100644
--- a/gdb/m68kbsd-nat.c
+++ b/gdb/m68kbsd-nat.c
@@ -20,6 +20,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
+#include "gdbcore.h"
 #include "inferior.h"
 #include "regcache.h"
 
@@ -167,3 +168,61 @@ store_inferior_registers (int regnum)
 	perror_with_name ("Couldn't write floating point status");
     }
 }
+
+
+/* Support for debugging kernel virtual memory images.  */
+
+#include <sys/types.h>
+#include <machine/pcb.h>
+
+#include "bsd-kvm.h"
+
+/* OpenBSD doesn't have these.  */
+#ifndef PCB_REGS_FP
+#define PCB_REGS_FP 10
+#endif
+#ifndef PCB_REGS_SP
+#define PCB_REGS_SP 11
+#endif
+
+static int
+m68kbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
+{
+  int regnum, tmp;
+  int i = 0;
+
+  /* The following is true for NetBSD 1.6.2:
+
+     The pcb contains %d2...%d7, %a2...%a7 and %ps.  This accounts for
+     all callee-saved registers.  From this information we reconstruct
+     the register state as it would look when we just returned from
+     cpu_switch().  */
+
+  /* The stack pointer shouldn't be zero.  */
+  if (pcb->pcb_regs[PCB_REGS_SP] == 0)
+    return 0;
+
+  for (regnum = M68K_D2_REGNUM; regnum <= M68K_D7_REGNUM; regnum++)
+    regcache_raw_supply (regcache, regnum, &pcb->pcb_regs[i++]);
+  for (regnum = M68K_A2_REGNUM; regnum <= M68K_SP_REGNUM; regnum++)
+    regcache_raw_supply (regcache, regnum, &pcb->pcb_regs[i++]);
+
+  tmp = pcb->pcb_ps & 0xffff;
+  regcache_raw_supply (regcache, M68K_PS_REGNUM, &tmp);
+
+  read_memory (pcb->pcb_regs[PCB_REGS_FP] + 4, (char *) &tmp, sizeof tmp);
+  regcache_raw_supply (regcache, M68K_PC_REGNUM, &tmp);
+
+  return 1;
+}
+
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+void _initialize_m68kbsd_nat (void);
+
+void
+_initialize_m68kbsd_nat (void)
+{
+  /* Support debugging kernel virtual memory images.  */
+  bsd_kvm_add_target (m68kbsd_supply_pcb);
+}