diff --git a/ChangeLog b/ChangeLog
index a1c5d5e89..4a9801412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Eliminate grub-fstest 4Gib barrier.
+
+	* util/grub-fstest.c (skip, leng): Use grub_disk_addr_t.
+	(read_file): Fix error reporting.
+
 2009-12-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Eliminate hexdump 4Gib barrier.
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 03184b632..fa54fe414 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -85,7 +85,7 @@ execute_command (char *name, int n, char **args)
 
 #define BUF_SIZE  32256
 
-static grub_off_t skip, leng;
+static grub_disk_addr_t skip, leng;
 
 static void
 read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
@@ -140,7 +140,7 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
 
   if (skip > file->size)
     {
-      grub_util_error ("invalid skip value %d.");
+      grub_util_error ("invalid skip value %lld.", (unsigned long long) skip);
       return;
     }