diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7b17b0146..5cb09f361 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 19 21:16:07 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* fork.cc (fork_parent): Move atforkprepare call here.
+	(fork): From here.
+
 Sat May 19 18:35:00 2001  Corinna Vinschen <corinna@vinschen.de>
 
 	* autoload.cc: Add missing load statement for `CancelIo'.
diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
index 8f569c95c..42ce8ff71 100644
--- a/winsup/cygwin/fork.cc
+++ b/winsup/cygwin/fork.cc
@@ -307,7 +307,7 @@ fork_child (HANDLE& hParent, dll *&first_dll, bool& load_dlls)
 
   /* Initialize signal/process handling */
   sigproc_init ();
-  __pthread_atforkchild();
+  __pthread_atforkchild ();
   cygbench ("fork-child");
   return 0;
 }
@@ -345,6 +345,9 @@ fork_parent (void *stack_here, HANDLE& hParent, dll *&first_dll,
   DWORD rc;
   PROCESS_INFORMATION pi = {0, NULL, 0, 0};
 
+  /* call the pthread_atfork prepare functions */
+  __pthread_atforkprepare ();
+
   subproc_init ();
 
 #ifdef DEBUGGING_NOTNEEDED
@@ -596,7 +599,7 @@ out:
   ForceCloseHandle (forker_finished);
   forker_finished = NULL;
   pi.hThread = NULL;
-  __pthread_atforkparent();
+  __pthread_atforkparent ();
 
   return forked->pid;
 
@@ -640,9 +643,6 @@ fork ()
       return -1;
     }
 
-  /* call the pthread_atfork prepare functions */
-  __pthread_atforkprepare();
-
   void *esp;
   __asm ("movl %%esp,%0": "=r" (esp));