diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index db8f96e671..a19c0a7079 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-07  Nathan J. Williams  <nathanw@wasabisystems.com>
+
+	* bsd-kvm.c: Include "gdbcore.h"
+	(bsd_kvm_open): Use get_exec_file() to set 'execfile'.
+
 2004-08-07  Andrew Cagney  <cagney@gnu.org>
 
 	* gdbtypes.c (build_flt, build_complex): New functions.
diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index 79ab09505f..45ce561951 100644
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -26,6 +26,7 @@
 #include "regcache.h"
 #include "target.h"
 #include "value.h"
+#include "gdbcore.h"		/* for get_exec_file */
 
 #include "gdb_assert.h"
 #include <fcntl.h>
@@ -73,6 +74,7 @@ bsd_kvm_open (char *filename, int from_tty)
 	}
     }
 
+  execfile = get_exec_file (0);
   temp_kd = kvm_openfiles (execfile, filename, NULL, O_RDONLY, errbuf);
   if (temp_kd == NULL)
     error ("%s", errbuf);