diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 621f48e4a..b2e4bebfc 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* internal.h (Elf_Internal_Shdr): Change sh_link and sh_info from
+	unsigned long to unsigned int.  Change sh_addralign to bfd_vma.
+	Order struct as for external version.
+
 2008-03-12  Alan Modra  <amodra@bigpond.net.au>
 
 	PR 5900
diff --git a/include/elf/internal.h b/include/elf/internal.h
index cacfc63bf..513f6763c 100644
--- a/include/elf/internal.h
+++ b/include/elf/internal.h
@@ -105,12 +105,12 @@ typedef struct elf_internal_shdr {
   unsigned int	sh_type;		/* Type of section */
   bfd_vma	sh_flags;		/* Miscellaneous section attributes */
   bfd_vma	sh_addr;		/* Section virtual addr at execution */
-  bfd_size_type	sh_size;		/* Size of section in bytes */
-  bfd_size_type	sh_entsize;		/* Entry size if section holds table */
-  unsigned long	sh_link;		/* Index of another section */
-  unsigned long	sh_info;		/* Additional section information */
   file_ptr	sh_offset;		/* Section file offset */
-  unsigned int	sh_addralign;		/* Section alignment */
+  bfd_size_type	sh_size;		/* Size of section in bytes */
+  unsigned int	sh_link;		/* Index of another section */
+  unsigned int	sh_info;		/* Additional section information */
+  bfd_vma	sh_addralign;		/* Section alignment */
+  bfd_size_type	sh_entsize;		/* Entry size if section holds table */
 
   /* The internal rep also has some cached info associated with it. */
   asection *	bfd_section;		/* Associated BFD section.  */