diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8db9a34744..00ae4cf130 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-03  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_make_bfd_section): Force debug flags for
+	all sections of the __DWARF segment.
+
 2009-12-03  Alan Modra  <amodra@bigpond.net.au>
 
 	PR ld/11047
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index 641fd9bd44..766fb3d76d 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -1480,8 +1480,13 @@ bfd_mach_o_make_bfd_section (bfd *abfd, bfd_mach_o_section *section,
   if (sname == NULL)
     return NULL;
 
-  if (section->flags & BFD_MACH_O_S_ATTR_DEBUG)
-    flags = SEC_HAS_CONTENTS | SEC_DEBUGGING;
+  if ((section->flags & BFD_MACH_O_S_ATTR_DEBUG)
+      || !strcmp (section->segname, "__DWARF"))
+    {
+      /* Force flags for dwarf sections.  This looks weird but dsym files
+         have no flags for them and this is important for gdb.  */
+      flags = SEC_HAS_CONTENTS | SEC_DEBUGGING;
+    }
   else
     {
       flags = SEC_ALLOC;