diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 68a1e84de..d5007e2c1 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-04  Christopher Faylor  <cgf@redhat.com>
+
+	* shared.cc (shared_info::heap_chunk_size): Be really defensive about
+	making sure that heap_chunk is set.
+
 2003-06-04  Christopher Faylor  <cgf@redhat.com>
 
 	* path.cc (conv_path_list): Use correct value when calculating length
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc
index c8c764c74..30c4582be 100644
--- a/winsup/cygwin/shared.cc
+++ b/winsup/cygwin/shared.cc
@@ -254,6 +254,8 @@ shared_info::heap_chunk_size ()
 	heap_chunk = 4 * 1024 * 1024;
       else
 	heap_chunk <<= 20;
+      if (!heap_chunk)
+	heap_chunk = 384 * 1024 * 1024;
       debug_printf ("fixed heap size is %u", heap_chunk);
     }