diff --git a/ChangeLog b/ChangeLog
index 28df32468..97b773d82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/hfspluscomp.c (grub_hfsplus_compress_attr): Add packed
+	attribute since structure is not necessarily aligned.
+
 2013-05-11  Andrey Borzenkov <arvidjaar@gmail.com>
 
 	* docs/grub.texi (Device syntax): Clarify description of network
diff --git a/grub-core/fs/hfspluscomp.c b/grub-core/fs/hfspluscomp.c
index b3434418c..13e4671e6 100644
--- a/grub-core/fs/hfspluscomp.c
+++ b/grub-core/fs/hfspluscomp.c
@@ -74,7 +74,7 @@ struct grub_hfsplus_compress_attr
   grub_uint32_t type;
   grub_uint32_t uncompressed_inline_size;
   grub_uint32_t always_0;
-};
+} __attribute__ ((packed));
 
 enum
   {