diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2ce27f5fa4..cf9c453683 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-ia64.c (get_got): Align the .got section at 8 bytes.
+
 2003-08-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elfxx-ia64.c (elfNN_ia64_finish_dynamic_symbol): Use
diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
index 0a732f4b60..27ffdddeae 100644
--- a/bfd/elfxx-ia64.c
+++ b/bfd/elfxx-ia64.c
@@ -1907,6 +1907,10 @@ get_got (abfd, info, ia64_info)
       BFD_ASSERT (got);
       ia64_info->got_sec = got;
 
+      /* The .got section is always aligned at 8 bytes.  */
+      if (!bfd_set_section_alignment (abfd, got, 3))
+	return 0;
+
       flags = bfd_get_section_flags (abfd, got);
       bfd_set_section_flags (abfd, got, SEC_SMALL_DATA | flags);
     }