diff --git a/ChangeLog b/ChangeLog
index b47780c52..0d8610312 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-19  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* stage2/stage2.c (cmain): Initialize DEFAULT_FILE to an empty
+	string. Reported by NATORI Shin <natori@adm.s.u-tokyo.ac.jp>.
+
 2005-03-15  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* stage2/fsys_fat.c (fat_mount): Ignore the 3rd bit of a media
diff --git a/THANKS b/THANKS
index 908cb9121..6e1d14506 100644
--- a/THANKS
+++ b/THANKS
@@ -88,6 +88,7 @@ Michael Hohmuth <hohmuth@innocent.com>
 Michael Sullivan <mike@trdlnk.com>
 Mike Meyer <mwm@mired.org>
 Miles Bader <miles@gnu.org>
+NATORI Shin <natori@adm.s.u-tokyo.ac.jp>
 Neal H Walfield <neal@walfield.org>
 Neelkanth Natu <neelnatu@yahoo.com>
 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
diff --git a/stage2/stage2.c b/stage2/stage2.c
index 96e18cd32..4dbf6f59c 100644
--- a/stage2/stage2.c
+++ b/stage2/stage2.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2000,2001,2002,2004  Free Software Foundation, Inc.
+ *  Copyright (C) 2000,2001,2002,2004,2005  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -872,6 +872,7 @@ cmain (void)
 	  
 	  /* Get a saved default entry if possible.  */
 	  saved_entryno = 0;
+	  *default_file = 0;
 	  grub_strncat (default_file, config_file, DEFAULT_FILE_BUFLEN);
 	  for (i = grub_strlen(default_file); i >= 0; i--)
 	    if (default_file[i] == '/')