diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5630be5f37..62fc7656dc 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-18  Nick Clifton  <nickc@redhat.com>
+
+	* peXXigen.c (rsrc_print_section): Use ptrdiff_t as the type for
+	pointer arithmetic.
+
 2013-12-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf32-arm.c (elf32_arm_post_process_headers): Call
@@ -107,6 +112,8 @@
 	(rsrc_process_section): New function - merges the contents of a
 	.rsrc section.
 	(_bfd_XXi_final_link_postscript): Call rsrc_process_section.
+	(rsrc_print_section): Fix mingw64 size issue.
+
 	* configure.in (AC_CHECK_HEADERS): Add wchar.h
 	* config.in: Regenerate.
 	* configure: Regenerate.
diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index 5e2a876ba1..2a33a776b7 100644
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -2205,7 +2205,7 @@ rsrc_print_section (bfd * abfd, void * vfile)
 	  /* Align data before continuing.  */
 	  int align = (1 << section->alignment_power) - 1;
 
-	  data = (bfd_byte *) (((long) (data + align)) & ~ align);
+	  data = (bfd_byte *) (((ptrdiff_t) (data + align)) & ~ align);
 	  rva_bias += data - p;
 
 	  /* For reasons that are unclear .rsrc sections are sometimes created