diff --git a/ChangeLog b/ChangeLog
index 4aa50c24e..78d610798 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-18  Christian Franke  <franke@computer.org>
+
+	* include/grub/i386/pc/init.h (struct grub_machine_mmap_entry):
+	Add attribute packed, gcc 3.4.4 on Cygwin aligns this
+	to 64 bit boundary by default.
+
 2007-11-18  Bean  <bean123ch@gmail.com>
 
 	* conf/common.rmk (pkgdata_MODULES): Add hexdump.mod.
diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
index 9ff593427..b2bde3410 100644
--- a/include/grub/i386/pc/init.h
+++ b/include/grub/i386/pc/init.h
@@ -39,7 +39,7 @@ struct grub_machine_mmap_entry
   grub_uint64_t addr;
   grub_uint64_t len;
   grub_uint32_t type;
-};
+} __attribute__((packed));
 
 /* Get a memory map entry. Return next continuation value. Zero means
    the end.  */