diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ce3554ef6..244da549e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-25  Corinna Vinschen  <corinna@vinschen.de>
+
+	* dcrt0.cc (dll_crt0_1): Call malloc_init and user_shared_initialize_1
+	only in non-dynamically loaded case.
+
 2008-07-25  Corinna Vinschen  <corinna@vinschen.de>
 
 	* dcrt0.cc (dll_crt0_0): Call malloc_init and user_shared_initialize_1
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 5fbf2df05..5c85eb834 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -777,7 +777,13 @@ void
 dll_crt0_1 (void *)
 {
   check_sanity_and_sync (user_data);
-  malloc_init ();
+
+  if (!dynamically_loaded)
+    {
+      malloc_init ();
+      user_shared_initialize_1 ();
+    }
+
 #ifdef CGF
   int i = 0;
   const int n = 2 * 1024 * 1024;
@@ -788,8 +794,6 @@ dll_crt0_1 (void *)
   ProtectHandle (hMainProc);
   ProtectHandle (hMainThread);
 
-  user_shared_initialize_1 ();
-
   cygheap->cwd.init ();
 
   /* Initialize pthread mainthread when not forked and it is safe to call new,