diff --git a/ChangeLog b/ChangeLog
index dc34c7077..ba2538e51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/kernel.h (FOR_MODULES): Check module magic.
+
 2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkimagexx.c (locate_sections): Support non-standard
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index 4c8b29c8b..eef4c3ffb 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -72,7 +72,7 @@ struct grub_module_info64
 extern grub_addr_t EXPORT_VAR (grub_modbase);
 
 #define FOR_MODULES(var)  for (\
-  var = grub_modbase ? (struct grub_module_header *) \
+  var = (grub_modbase && ((((struct grub_module_info *) grub_modbase)->magic) == GRUB_MODULE_MAGIC)) ? (struct grub_module_header *) \
     (grub_modbase + (((struct grub_module_info *) grub_modbase)->offset)) : 0;\
   var && (grub_addr_t) var \
     < (grub_modbase + (((struct grub_module_info *) grub_modbase)->size));    \