diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a05487b6d2..940afe5e24 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-22  Tristan Gingold  <gingold@adacore.com>
+
+	* mach-o.c (bfd_mach_o_print_symbol): Display COM for common
+	symbols.  Print section name in brackets.
+
 2011-11-21  Andreas Tobler  <andreast@fgznet.ch>
 
 	* config.bfd: Add vectors for powerpc and powerpc64-freebsd.
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index 91f0306f5e..96b993caab 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -547,7 +547,10 @@ bfd_mach_o_print_symbol (bfd *abfd,
 	switch (asym->n_type & BFD_MACH_O_N_TYPE)
 	  {
 	  case BFD_MACH_O_N_UNDF:
-	    name = "UND";
+            if (symbol->value == 0)
+              name = "UND";
+            else
+              name = "COM";
 	    break;
 	  case BFD_MACH_O_N_ABS:
 	    name = "ABS";
@@ -571,7 +574,7 @@ bfd_mach_o_print_symbol (bfd *abfd,
                asym->n_type, name, asym->n_sect, asym->n_desc);
       if ((asym->n_type & BFD_MACH_O_N_STAB) == 0
 	  && (asym->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_SECT)
-	fprintf (file, " %-5s", symbol->section->name);
+	fprintf (file, " [%s]", symbol->section->name);
       fprintf (file, " %s", symbol->name);
     }
 }