diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f25d06a2d..723b5b482 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-06  Christopher Faylor  <cgf@redhat.com>
+
+	* spawn.cc (spawn_guts): Don't set mount_h here.
+	* sigproc.cc (init_child_info): Set it here instead.
+	* shared.cc (cygwin_mount_h): Make NO_COPY.
+
 2002-08-06  Christopher Faylor  <cgf@redhat.com>
 
 	* cygthread.cc (cygthread::stub): Accept flag to pass info structure to
diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index 96ba45a5b..4914e6a24 100644
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -828,6 +828,7 @@ init_child_info (DWORD chtype, child_info *ch, pid_t pid, HANDLE subproc_ready)
   ch->subproc_ready = subproc_ready;
   ch->pppid_handle = myself->ppid_handle;
   ch->fhandler_union_cb = sizeof (fhandler_union);
+  ch->mount_h = cygwin_mount_h;
 }
 
 /* Check the state of all of our children to see if any are stopped or
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 7454adc58..602c0af69 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -608,7 +608,6 @@ spawn_guts (const char * prog_arg, const char *const *argv,
   char sa_buf[1024];
 
   cygbench ("spawn-guts");
-  ciresrv.mount_h = cygwin_mount_h;
 
   if (!cygheap->user.issetuid ())
     {