diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a8cabeaee..6b1a79d1d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-18  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygwin.sc: Set alignment of .cygheap section to 64K.
+
 2011-02-15  Corinna Vinschen  <corinna@vinschen.de>
 
 	* spawn.cc (spawn_guts): Only set PID_NOTCYGWIN in _P_OVERLAY mode.
diff --git a/winsup/cygwin/cygwin.sc b/winsup/cygwin/cygwin.sc
index ba45441f6..ba4152909 100644
--- a/winsup/cygwin/cygwin.sc
+++ b/winsup/cygwin/cygwin.sc
@@ -104,6 +104,7 @@ SECTIONS
   .cygheap ALIGN(__section_alignment__) :
   {
     . = . + (1024 * 1024);
+    . = ALIGN(0x10000);
     __cygheap_end = ABSOLUTE(.);
   }
   /DISCARD/ :