diff --git a/ChangeLog b/ChangeLog
index dbcbfc90c..0e057107b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-01  Vesa Jaaskelainen  <chaac@nic.fi>
+
+	* normal/main.c (grub_normal_menu_addentry): Fixed menu size
+	calculation.
+	(read_config_file): Made it to close file before returning.
+
 2006-03-31  Vesa Jaaskelainen  <chaac@nic.fi>
 
 	* DISTLIST: Added include/grub/i386/pc/vbeblit.h,
diff --git a/normal/main.c b/normal/main.c
index 3394a33dc..eca6b32c7 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -153,6 +153,8 @@ grub_normal_menu_addentry (const char *title, struct grub_script *script,
   (*last)->next = 0;
   (*last)->sourcecode = sourcecode;
 
+  current_menu->size++;
+
   return GRUB_ERR_NONE;
 }
 
@@ -223,10 +225,8 @@ read_config_file (const char *config)
       grub_script_free (parsed_script);
     }
 
-  return newmenu;
-
   grub_file_close (file);
-  return 0;
+  return newmenu;
 }
 
 /* This starts the normal mode.  */