diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index bf83619e4..2919c99b2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-04  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+	* dll_init.cc (dll_global_dtors): Avoid calling destructors during
+	failing fork().
+
 2011-05-04  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler.h (class fhandler_base): Remove uninterruptible_io status
diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc
index 85f3bae3f..99974944b 100644
--- a/winsup/cygwin/dll_init.cc
+++ b/winsup/cygwin/dll_init.cc
@@ -37,6 +37,11 @@ static bool dll_global_dtors_recorded;
 void
 dll_global_dtors ()
 {
+  /* Don't attempt to call destructors if we're still in fork processing
+     since that likely means fork is failing and everything will not have been
+     set up.  */
+  if (in_forkee)
+    return;
   int recorded = dll_global_dtors_recorded;
   dll_global_dtors_recorded = false;
   if (recorded && dlls.start.next)