diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f1e9471b5..f9c4f1a5d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-04  Thomas Pfaff  <tpfaff@gmx.net>
+
+	* thread.cc (MTinterface::fixup_after_fork): Initialize mainthread
+	prior to pthread objects.
+	
 2003-03-04  Jason Tishler <jason@tishler.net>
 
 	* fhandler_socket.cc (fhandler_socket::dup): Initialize type.
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index ea0626142..9f8839fb1 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -213,6 +213,10 @@ void
 MTinterface::fixup_after_fork (void)
 {
   pthread_key::fixup_after_fork ();
+
+  threadcount = 1;
+  pthread::initMainThread (true);
+
   pthread_mutex *mutex = mutexs;
   debug_printf ("mutexs is %x",mutexs);
   while (mutex)
@@ -234,10 +238,6 @@ MTinterface::fixup_after_fork (void)
       sem->fixup_after_fork ();
       sem = sem->next;
     }
-
-  pthread::initMainThread (true);
-
-  threadcount = 1;
 }
 
 /* pthread calls */