diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3d2c4d522..a7f8fd2c7 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-01  Christopher Faylor  <cgf@timesys.com>
+
+	* cygwin.sc: Don't output .reloc or .rsrc sections.  Clean up stuff
+	around .cygheap and use a workaround to get things working with newer
+	(broken?) binutils.
+
 2005-05-31  Christopher Faylor  <cgf@timesys.com>
 
 	* cygheap.cc (cygheap_end): Remove bogus section attribute.
diff --git a/winsup/cygwin/cygwin.sc b/winsup/cygwin/cygwin.sc
index 6b5df0dec..195a6b2dd 100644
--- a/winsup/cygwin/cygwin.sc
+++ b/winsup/cygwin/cygwin.sc
@@ -63,6 +63,8 @@ SECTIONS
     *(.debug$T)
     *(.debug$F)
     *(.drectve)
+    *(.reloc)
+    *(.rsrc)
   }
   .stab ALIGN(__section_alignment__) (NOLOAD) :
   {
@@ -100,13 +102,13 @@ SECTIONS
     . = ALIGN(16);
     __cygheap_start = ABSOLUTE(.);
   }
-  osection_alignment = __section_alignment__;
-  __section_alignment__ = 64 * 1024;
-  .cygheap ALIGN(4096):
+  .cygheap ALIGN(__section_alignment__):
   {
-    __cygheap_mid = ABSOLUTE(.);
+    __cygheap_mid = .;
+    *(.cygheap)
     . = ALIGN(512 * 1024, 0x10000);
     . += 8192;		/* inexplicably needed for alignment on 64K boundary?!? */
   }
   __cygheap_end = ABSOLUTE(.);
+  __cygheap_end1 = __cygheap_mid + SIZEOF(.cygheap);
 }