diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 723b5b482..4d6a7238b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-06  Christopher Faylor  <cgf@redhat.com>
+	    Conrad Scott  <conrad.scott@dsl.pipex.com
+
+	* cygheap.cc (_csbrk): Allocate some slop initially.  Don't erroneously
+	add sbrk amount to returned value in initial case.
+
 2002-08-06  Christopher Faylor  <cgf@redhat.com>
 
 	* spawn.cc (spawn_guts): Don't set mount_h here.
diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index edd77fcf3..976618bf7 100644
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -177,8 +177,8 @@ _csbrk (int sbs)
     {
       init_cheap ();
       cygheap_max = cygheap;
-      (void) _csbrk ((int) pagetrunc (4095 + sbs + sizeof (*cygheap)));
-      prebrk = (char *) (cygheap + 1) + sbs;
+      (void) _csbrk (sbs + sizeof (*cygheap) + (2 * system_info.dwPageSize));
+      prebrk = (char *) (cygheap + 1);
     }
   else
     {
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc
index dd8e67c63..7585d6364 100644
--- a/winsup/cygwin/shared.cc
+++ b/winsup/cygwin/shared.cc
@@ -29,7 +29,7 @@ details. */
 
 shared_info NO_COPY *cygwin_shared = NULL;
 mount_info NO_COPY *mount_table = NULL;
-HANDLE cygwin_mount_h;
+HANDLE NO_COPY cygwin_mount_h;
 
 char * __stdcall
 shared_name (const char *str, int num)