diff --git a/ChangeLog b/ChangeLog
index 844f603b0..0053575cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-01  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/i386/linux.h (linux_kernel_params): Change `mmap_size'
+	type to `grub_uint8_t', and adjust `padding9' accordingly.
+
 2009-06-29  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): New macro.
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index 641c09016..cf110973e 100644
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -239,9 +239,9 @@ struct linux_kernel_params
 
   grub_uint8_t padding8[0x1e8 - 0x1e4];
 
-  grub_uint32_t mmap_size;		/* 1e8 */
+  grub_uint8_t mmap_size;		/* 1e8 */
 
-  grub_uint8_t padding9[0x1f1 - 0x1ec];
+  grub_uint8_t padding9[0x1f1 - 0x1e9];
 
   grub_uint8_t setup_sects;		/* The size of the setup in sectors */
   grub_uint16_t root_flags;		/* If the root is mounted readonly */