diff --git a/ChangeLog b/ChangeLog
index 47fb57b0f..1e9a554fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/ntfs.c (grub_ntfs_iterate_dir): Use grub_uint8_t for
+	mask rather than 64-bit type.
+
+	Saves 20 bytes on compressed image.
+
 2013-10-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/ntfs.c (read_data): Move code for compressed data to ...
diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
index 04bf8b5a5..3ed926dc6 100644
--- a/grub-core/fs/ntfs.c
+++ b/grub-core/fs/ntfs.c
@@ -839,7 +839,8 @@ grub_ntfs_iterate_dir (grub_fshelp_node_t dir,
 
   if (bitmap)
     {
-      grub_disk_addr_t v, i;
+      grub_disk_addr_t i;
+      grub_uint8_t v;
 
       indx = grub_malloc (mft->data->idx_size << GRUB_NTFS_BLK_SHR);
       if (indx == NULL)
@@ -862,7 +863,7 @@ grub_ntfs_iterate_dir (grub_fshelp_node_t dir,
 		goto done;
 	    }
 	  v <<= 1;
-	  if (v >= 0x100)
+	  if (!v)
 	    {
 	      v = 1;
 	      bitmap++;