diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3f04adeb3f4..f586c397630 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-12  Joel Brobecker  <brobecker@adacore.com>
+
+	From Joel Sherrill  <joel.sherrill@oarcorp.com>
+	* remote-sim.c (gdbsim_mourn_inferior): Use "target" parameter
+	instead of the "gdbsim_ops" global.
+
 2008-11-11  Doug Evans  <dje@google.com>
 
 	* infcall.c (call_function_by_hand): Handle inferior exit.
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 6f92ad83f07..db26c93fd4c 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -829,7 +829,7 @@ gdbsim_mourn_inferior (struct target_ops *target)
     printf_filtered ("gdbsim_mourn_inferior:\n");
 
   remove_breakpoints ();
-  target_mark_exited (&gdbsim_ops);
+  target_mark_exited (target);
   generic_mourn_inferior ();
   delete_thread_silent (remote_sim_ptid);
 }