diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4651e7e6f6..d0915241f2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+Tue Nov 21 13:03:57 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* coffgen.c (coff_renumber_symbols): Sort common symbols with
+	global symbols.
+
+	* coffcode.h (coff_compute_section_file_positions): Only pad the
+	previous section to force file alignment when creating an
+	executable.
+
 Mon Nov 20 14:54:09 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* coffcode.h (coff_compute_section_file_positions): If
diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index 4bce970a83..cb9b2ba630 100644
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -634,16 +634,18 @@ coff_renumber_symbols (bfd_ptr, first_undef)
     for (i = 0; i < symbol_count; i++)
       if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) != 0
 	  || (!bfd_is_und_section (symbol_ptr_ptr[i]->section)
+	      && !bfd_is_com_section (symbol_ptr_ptr[i]->section)
 	      && ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL | BSF_FUNCTION))
 		  != BSF_GLOBAL)))
 	*newsyms++ = symbol_ptr_ptr[i];
 
     for (i = 0; i < symbol_count; i++)
       if (!bfd_is_und_section (symbol_ptr_ptr[i]->section)
-	  && ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL
-					   | BSF_NOT_AT_END
-					   | BSF_FUNCTION))
-	      == BSF_GLOBAL))
+	  && (bfd_is_com_section (symbol_ptr_ptr[i]->section)
+	      || ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL
+					       | BSF_NOT_AT_END
+					       | BSF_FUNCTION))
+		  == BSF_GLOBAL)))
 	*newsyms++ = symbol_ptr_ptr[i];
 
     *first_undef = newsyms - bfd_ptr->outsymbols;