diff --git a/ChangeLog b/ChangeLog
index bb444699e..1e1dbb34a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/diskfilter.h (grub_diskfilter_vg): Increase extent_size
+	to uint64_t to prevent overflow.
+	(grub_diskfilter_lv): Increase start_extent and extent_count
+	to uint64_t to prevent overflow.
+
 2012-04-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Increase version.
diff --git a/include/grub/diskfilter.h b/include/grub/diskfilter.h
index 63ba1f1f6..95754564d 100644
--- a/include/grub/diskfilter.h
+++ b/include/grub/diskfilter.h
@@ -42,7 +42,7 @@ struct grub_diskfilter_vg {
   grub_size_t uuid_len;
   /* Optional.  */
   char *name;
-  int extent_size;
+  grub_uint64_t extent_size;
   struct grub_diskfilter_pv *pvs;
   struct grub_diskfilter_lv *lvs;
   struct grub_diskfilter_vg *next;
@@ -100,8 +100,8 @@ struct grub_diskfilter_lv {
 };
 
 struct grub_diskfilter_segment {
-  unsigned int start_extent;
-  unsigned int extent_count;
+  grub_uint64_t start_extent;
+  grub_uint64_t extent_count;
   enum 
     {
       GRUB_DISKFILTER_STRIPED = 0,