diff --git a/ChangeLog b/ChangeLog
index ca8b4abe0..548680e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/disk/lvm.c (grub_lvm_getvalue): Handle 64-bit values.
+
 2012-06-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/fat.c (grub_fat_iterate_dir_next): Don't stop on a space
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
index e0cf880cf..508e94af0 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -37,14 +37,14 @@ GRUB_MOD_LICENSE ("GPLv3+");
 /* Go the string STR and return the number after STR.  *P will point
    at the number.  In case STR is not found, *P will be NULL and the
    return value will be 0.  */
-static int
+static grub_uint64_t
 grub_lvm_getvalue (char **p, const char *str)
 {
   *p = grub_strstr (*p, str);
   if (! *p)
     return 0;
   *p += grub_strlen (str);
-  return grub_strtoul (*p, p, 10);
+  return grub_strtoull (*p, p, 10);
 }
 
 #if 0