diff --git a/ChangeLog b/ChangeLog
index cb916ba75..89ea3d33f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/fileXX.c: Silence cast-align.
+	* grub-core/loader/i386/xen_fileXX.c: Likewise.
+
 2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/efi/api.h (GRUB_EFI_ERROR_CODE): Use explicit cast
diff --git a/grub-core/commands/fileXX.c b/grub-core/commands/fileXX.c
index 4d5c9d7ef..c9857ff67 100644
--- a/grub-core/commands/fileXX.c
+++ b/grub-core/commands/fileXX.c
@@ -19,6 +19,8 @@
 #include <grub/fileid.h>
 #include <grub/elfload.h>
 
+#pragma GCC diagnostic ignored "-Wcast-align"
+
 int
 grub_file_check_netbsdXX (grub_elf_t elf)
 {
diff --git a/grub-core/loader/i386/xen_fileXX.c b/grub-core/loader/i386/xen_fileXX.c
index 0a7e2ce98..6df001576 100644
--- a/grub-core/loader/i386/xen_fileXX.c
+++ b/grub-core/loader/i386/xen_fileXX.c
@@ -156,6 +156,8 @@ parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi,
   return GRUB_ERR_NONE;
 }
 
+#pragma GCC diagnostic ignored "-Wcast-align"
+
 static grub_err_t
 parse_note (grub_elf_t elf, struct grub_xen_file_info *xi,
 	    grub_off_t off, grub_size_t sz)
@@ -258,8 +260,6 @@ parse_note (grub_elf_t elf, struct grub_xen_file_info *xi,
   return GRUB_ERR_NONE;
 }
 
-#pragma GCC diagnostic ignored "-Wcast-align"
-
 grub_err_t
 grub_xen_get_infoXX (grub_elf_t elf, struct grub_xen_file_info *xi)
 {