diff --git a/ChangeLog b/ChangeLog
index eb2b09d1e..4a4a9bf0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/ls.c (grub_ls_list_files): Fix overflow.
+
 2012-05-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/sfs.c (grub_fshelp_node): Fix types.
diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
index f36202b71..8b9fe7344 100644
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -138,7 +138,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 	  else
 	    {
 	      grub_uint64_t fsize = file->size * 100ULL;
-	      int fsz = file->size;
+	      grub_uint64_t fsz = file->size;
 	      int units = 0;
 	      char buf[20];