diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3b0329ba4..7f449cf10 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-08  Christopher Faylor  <cgf@timesys.com>
+
+	* cygwin.sc: Restore resource and reloc sections and use more modern
+	syntax for stabs sections.
+
 2005-06-08  Christopher Faylor  <cgf@timesys.com>
 
 	* environ.cc (spenvs): Remove cut/paste error which associated
diff --git a/winsup/cygwin/cygwin.sc b/winsup/cygwin/cygwin.sc
index 195a6b2dd..855bbab9e 100644
--- a/winsup/cygwin/cygwin.sc
+++ b/winsup/cygwin/cygwin.sc
@@ -57,22 +57,29 @@ SECTIONS
   {
     *(.edata)
   }
+  .rsrc BLOCK(__section_alignment__) :
+  {
+    *(.rsrc)
+    *(SORT(.rsrc$*))
+  }
+  .reloc BLOCK(__section_alignment__) :
+  {
+    *(.reloc)
+  }
   /DISCARD/ :
   {
     *(.debug$S)
     *(.debug$T)
     *(.debug$F)
     *(.drectve)
-    *(.reloc)
-    *(.rsrc)
   }
   .stab ALIGN(__section_alignment__) (NOLOAD) :
   {
-    [ .stab ]
+    *(.stab)
   }
   .stabstr ALIGN(__section_alignment__) (NOLOAD) :
   {
-    [ .stabstr ]
+    *(.stabstr)
   }
   /* DWARF 1.1 and DWARF 2 */
   .debug_aranges  ALIGN(__section_alignment__) (NOLOAD) : { *(.debug_aranges) }