diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 93ead8c54..1512949c8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -2,6 +2,7 @@
 
 	* cygheap.cc (_csbrk): Avoid !cygheap considerations.
 	(cygheap_init): Deal with unintialized cygheap issues here.
+	(cheap_init): Move cygheap_max setting here.
 
 2002-08-06  Christopher Faylor  <cgf@redhat.com>
 	    Conrad Scott  <conrad.scott@dsl.pipex.com
diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index fb13fbed6..7ea7a39c3 100644
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -61,6 +61,7 @@ init_cheap ()
       api_fatal ("AllocationBase %p, BaseAddress %p, RegionSize %p, State %p\n",
 		 m.AllocationBase, m.BaseAddress, m.RegionSize, m.State);
     }
+  cygheap_max = cygheap;
 }
 
 static void dup_now (void *, child_info *, unsigned) __attribute__ ((regparm(3)));
@@ -189,7 +190,6 @@ cygheap_init ()
   if (!cygheap)
     {
       init_cheap ();
-      cygheap_max = cygheap;
       (void) _csbrk (sizeof (*cygheap));
     }
   if (!cygheap->fdtab)