diff --git a/ChangeLog b/ChangeLog
index dc7f7c630..d688fe93a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/menuentry.c (grub_normal_add_menu_entry): Add
+	zero terminator. Fixes a crash.
+
 2012-03-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/loader/i386/linux.c (allocate_pages): Don't allocate
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index 6999123ce..403c751ea 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -99,7 +99,8 @@ grub_normal_add_menu_entry (int argc, const char **args,
     {
       int i;
       for (i = 0; classes[i]; i++); /* count # of menuentry classes */
-      menu_classes = grub_zalloc (sizeof (struct grub_menu_entry_class) * i);
+      menu_classes = grub_zalloc (sizeof (struct grub_menu_entry_class)
+				  * (i + 1));
       if (! menu_classes)
 	goto fail;