diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 957496551f..cc331a97ff 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR 440
+	* coffcode.h (coff_compute_section_file_positions): Cast to
+	bfd_vma when computing page alignment.
+
 2004-10-13  Mark Mitchell  <mark@codesourcery.com>
 
 	* elf32-arm.h (elf32_arm_finish_dynamic_sections): Use file
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 9d78c25257..7bfdc6b175 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -3243,7 +3243,7 @@ coff_compute_section_file_positions (abfd)
 #ifdef COFF_PAGE_SIZE
       if ((abfd->flags & D_PAGED) != 0
 	  && (current->flags & SEC_ALLOC) != 0)
-	sofar += (current->vma - sofar) % page_size;
+	sofar += (current->vma - (bfd_vma) sofar) % page_size;
 #endif
       current->filepos = sofar;