diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3e178ae14f..352deeb328 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-18  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* dwarf2-frame.c (struct comp_unit): Use bfd_size_type for
+	dwarf_frame_size.
+
 2009-06-17  Tom Tromey  <tromey@redhat.com>
 
 	* dwarf2read.c (zlib_decompress_section): Use a cleanup.
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index cf080b35f3..67265f2d7e 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -130,7 +130,7 @@ struct comp_unit
   gdb_byte *dwarf_frame_buffer;
 
   /* Length of the loaded .debug_frame section.  */
-  unsigned long dwarf_frame_size;
+  bfd_size_type dwarf_frame_size;
 
   /* Pointer to the .debug_frame section.  */
   asection *dwarf_frame_section;