diff --git a/ChangeLog b/ChangeLog
index 0ccded9f6..192ebb56a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkimage.c: Disable -Wcast-align.
+
 2012-06-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/genmod.sh.in: Enable objconv errors 2030, 2050 and 2031
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 44c2d494b..359baecd4 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -688,6 +688,8 @@ struct fixup_block_list
   struct grub_pe32_fixup_block b;
 };
 
+#pragma GCC diagnostic ignored "-Wcast-align"
+
 #define MKIMAGE_ELF32 1
 #include "grub-mkimagexx.c"
 #undef MKIMAGE_ELF32