diff --git a/ChangeLog b/ChangeLog
index 3c3933f1f..b6d3cb372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkimage.c (generate_image): Use size_t instead of
+	grub_size_t.
+	* util/grub-mkimagexx.c (locate_sections): Likewise.
+	(load_image): Likewise.
+
 2013-10-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/misc.c (grub_util_write_image_at): Don't use PRIxGRUB_SIZE for
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 61e06a09b..755231d25 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -790,10 +790,10 @@ generate_image (const char *dir, const char *prefix,
   char *kernel_path;
   size_t offset;
   struct grub_util_path_list *path_list, *p, *next;
-  grub_size_t bss_size;
+  size_t bss_size;
   grub_uint64_t start_address;
   void *rel_section = 0;
-  grub_size_t reloc_size = 0, align;
+  size_t reloc_size = 0, align;
   size_t decompress_size = 0;
 
   if (comp == COMPRESSION_AUTO)
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index e777cf3e1..aa31fc9fd 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -800,8 +800,8 @@ SUFFIX (check_elf_header) (Elf_Ehdr *e, size_t size, struct image_target_desc *i
 static Elf_Addr *
 SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
 			  Elf_Half num_sections, const char *strtab,
-			  grub_size_t *exec_size, grub_size_t *kernel_sz,
-			  grub_size_t *all_align,
+			  size_t *exec_size, size_t *kernel_sz,
+			  size_t *all_align,
 			  struct image_target_desc *image_target)
 {
   int i;
@@ -879,11 +879,11 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
 }
 
 static char *
-SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size, 
-		     grub_size_t *kernel_sz, grub_size_t *bss_size,
-		     grub_size_t total_module_size, grub_uint64_t *start,
-		     void **reloc_section, grub_size_t *reloc_size,
-		     grub_size_t *align,
+SUFFIX (load_image) (const char *kernel_path, size_t *exec_size, 
+		     size_t *kernel_sz, size_t *bss_size,
+		     size_t total_module_size, grub_uint64_t *start,
+		     void **reloc_section, size_t *reloc_size,
+		     size_t *align,
 		     struct image_target_desc *image_target)
 {
   char *kernel_img, *out_img;