diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a0c7fb404..b1f48381c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-19  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygwin.sc: Add Dwarf-2 debug sections.
+
 2005-05-19  Corinna Vinschen  <corinna@vinschen.de>
 
 	* mmap.cc (mmap64): Make granularity an automatic variable.
diff --git a/winsup/cygwin/cygwin.sc b/winsup/cygwin/cygwin.sc
index fe00e2bd4..a911b93e4 100644
--- a/winsup/cygwin/cygwin.sc
+++ b/winsup/cygwin/cygwin.sc
@@ -103,6 +103,19 @@ SECTIONS
   {
     [ .stabstr ]
   }
+  /* DWARF 1.1 and DWARF 2 */
+  .debug_aranges  BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_aranges) }
+  .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_pubnames) }
+  /* DWARF 2 */
+  .debug_info     BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_info) }
+  .debug_abbrev   BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_abbrev) }
+  .debug_line     BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_line) }
+  .debug_frame    BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_frame) }
+  .debug_str      BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_str) }
+  .debug_loc      BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_loc) }
+  .debug_macinfo  BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_macinfo) }
+  .debug_macinfo  BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_macinfo) }
+  .debug_ranges   BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_ranges) }
   .cygheap BLOCK(64 * 1024) :
   {
     __system_dlls__ = ABSOLUTE(.) ;