diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 74879780ba..0ff625406e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 Thu Sep 30 11:30:56 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+	* corelow.c (core_detach): Call reinit_frame_cache.
+	* target.c (target_detach): Don't call generic_mourn_inferior
+	(revert yesterday's change, now handled by core_detach).
+	* objfiles.c (free_objfile): Detach any core file if we call
+	SOLIB_CLEAR.  #include target.h.
+
 	* fork-child.c (fork_inferior): Don't call target_terminal_init
 	and target_terminal_inferior until we are sure that the inferior
 	has called gdb_setpgid.  This fixes PR 2900 (Schauer tracked it
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 749acce6e1..a30f2c3089 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -216,6 +216,7 @@ core_detach (args, from_tty)
   if (args)
     error ("Too many arguments");
   unpush_target (&core_ops);
+  reinit_frame_cache ();
   if (from_tty)
     printf_filtered ("No core file now.\n");
 }
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 903b9bd2ea..7b55084d13 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -27,6 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "symfile.h"
 #include "objfiles.h"
 #include "gdb-stabs.h"
+#include "target.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -339,6 +340,14 @@ free_objfile (objfile)
      
 #if defined (CLEAR_SOLIB)
   CLEAR_SOLIB ();
+  /* CLEAR_SOLIB closes the bfd's for any shared libraries.  But
+     the to_sections for a core file might refer to those bfd's.  So
+     detach any core file.  */
+  {
+    struct target_ops *t = find_core_target ();
+    if (t != NULL)
+      (t->to_detach) (NULL, 0);
+  }
 #endif
   clear_pc_function_cache ();