diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8c8b4b074ae..317f003984d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  6 14:11:30 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config/tc-sh.c (sh_do_align): Only align using the nop pattern
+	if aligning to a longword boundary or greater.
+
 Tue Mar  5 15:10:43 1996  Jim Wilson  <wilson@chestnut.cygnus.com>
 
 	* config/tc-sh.c (sh_do_align): Pass 1 not 2 to frag_align.