diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 77e0497c8..07bde3bd7 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-05  Christopher Faylor  <cgf@timesys.com>
+
+	* dcrt0.cc (dll_crt0_0): Move user_data->{resourcelocks,threadinterface}
+	initialization here from dll_crt0_1.
+	(dll_crt0_1): See above.
+
 2006-04-04  Corinna Vinschen  <corinna@vinschen.de>
 
 	* net.cc (fdsock): Raise default SO_RCVBUF/SO_SNDBUF buffer sizes to
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 6a6ced98a..dcc13d528 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -755,6 +755,9 @@ dll_crt0_0 ()
 	}
     }
 
+  user_data->resourcelocks->Init ();
+  user_data->threadinterface->Init ();
+
   _cygtls::init ();
 
   /* Initialize events */
@@ -792,8 +795,6 @@ dll_crt0_1 (char *)
     small_printf ("cmalloc returns %p\n", cmalloc (HEAP_STR, n));
 #endif
 
-  user_data->resourcelocks->Init ();
-  user_data->threadinterface->Init ();
   ProtectHandle (hMainProc);
   ProtectHandle (hMainThread);