diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 38dbdbd96d..b5f6c42b94 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-30  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf.c (elfcore_write_note): Pad to 4-byte boundary.
+
 2006-10-28  Richard Sandiford  <richard@codesourcery.com>
 
 	* elf32-mips.c (elf_mips_howto_table_rel): Add R_MIPS_GLOB_DAT.
diff --git a/bfd/elf.c b/bfd/elf.c
index 24ca6df7c9..747310bf58 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -8120,7 +8120,7 @@ elfcore_write_note (bfd  *abfd,
 
       namesz = strlen (name) + 1;
       bed = get_elf_backend_data (abfd);
-      pad = -namesz & ((1 << bed->s->log_file_align) - 1);
+      pad = -namesz & 3;
     }
 
   newspace = 12 + namesz + pad + size;