diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 25230aa04a..e5fe0ebb9b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -8,6 +8,9 @@ Tue Jan 23 14:33:05 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 Tue Jan 23 14:22:45 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* coffcode.h (coff_new_section_hook): Don't try to align the
+	.stabstr section.
+
 	* coffcode.h (coff_set_section_contents): Fix the handling of the
 	.lib section to work even if the entire section contents are
 	written at once.  From Gvran Uddeborg <gvran@uddeborg.pp.se> and
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 44aea2afcf..6cd9cc3112 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -906,6 +906,11 @@ coff_new_section_hook (abfd, section)
 	  || strcmp (section->name, ".dtors") == 0))
     section->alignment_power = 2;
 
+  /* Similarly, the .stabstr section must be aligned to 2**0 at most.  */
+  if (COFF_DEFAULT_SECTION_ALIGNMENT_POWER > 0
+      && strncmp (section->name, ".stabstr", 8) == 0)
+    section->alignment_power = 0;
+
   return true;
 }