diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fc7eca1ac1..5df36f34ee 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-05  Bibo Mao  <bibo.mao@intel.com>
+
+	PR binutils/3171
+	* coffcode.h (coff_write_object_contents): Set the optional
+	header magic number to PE32PMAGIC instead of ZMAGIC for ia64.
+
 2006-09-04  Mark Shinwell  <shinwell@codesourcery.com>
 
         * elf32-arm.c (elf32_arm_howto_table_1): Adjust entries for
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index badb214470..fa0a206a5e 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -3869,7 +3869,7 @@ coff_write_object_contents (bfd * abfd)
 
 #if defined(IA64)
 #define __A_MAGIC_SET__
-    internal_a.magic = ZMAGIC;
+    internal_a.magic = PE32PMAGIC;
 #endif /* IA64 */
 
 #if defined(SPARC)