diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 91bdc45c0e3..be36403d9da 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-15  Jon Turney  <jon.turney@dronecode.org.uk>
+
+	* bfd.c: Change struct bfd_build_id to use bfd_size_type.
+	* bfd-in2.h : Regenerate.
+
 2015-06-16  Alan Modra  <amodra@gmail.com>
 
 	* elf32-ppc.c (ppc_elf_relocate_section): Correct binary search of
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index dfffe3c5266..2d32c7481b7 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -6328,7 +6328,7 @@ enum bfd_plugin_format
 
 struct bfd_build_id
   {
-    size_t size;
+    bfd_size_type size;
     bfd_byte data[1];
   };
 
diff --git a/bfd/bfd.c b/bfd/bfd.c
index e60f3581a3a..8d85de50b97 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -53,7 +53,7 @@ CODE_FRAGMENT
 .
 .struct bfd_build_id
 .  {
-.    size_t size;
+.    bfd_size_type size;
 .    bfd_byte data[1];
 .  };
 .