diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 694396a2f..ec81ae8a1 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-29  Thomas Pfaff  <tpfaff@gmx.net>
+
+	* thread.cc (pthread::atforkprepare): Call
+	MT_INTERFACE->fixup_before_fork at the end of atforkprepare.
+
 2004-03-29  Corinna Vinschen  <corinna@vinschen.de>
 
 	* net.cc (wsock_event::wait): Change scope of local "len" variable.
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index 11a9d0629..a18834ddf 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -1941,8 +1941,6 @@ pthread::cancel (pthread_t thread)
 void
 pthread::atforkprepare (void)
 {
-  MT_INTERFACE->fixup_before_fork ();
-
   callback *cb = MT_INTERFACE->pthread_prepare;
   while (cb)
     {
@@ -1951,6 +1949,8 @@ pthread::atforkprepare (void)
     }
 
   __fp_lock_all ();
+
+  MT_INTERFACE->fixup_before_fork ();
 }
 
 void