diff --git a/ChangeLog b/ChangeLog
index 13b49c0b3..159c14964 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/udf.c (grub_udf_partmap): Add packed attribute
+	as it's not necessarily aligned.
+
 2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/mips/qemu_mips/init.c (grub_at_keyboard_init): Remove
diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
index 4097fd2e6..537bb37f0 100644
--- a/grub-core/fs/udf.c
+++ b/grub-core/fs/udf.c
@@ -317,7 +317,7 @@ struct grub_udf_partmap
       grub_uint8_t ident[62];
     } type2;
   };
-};
+} __attribute__ ((packed));
 
 struct grub_udf_lvd
 {