diff --git a/ChangeLog b/ChangeLog
index db663167d..80821a6be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-20  Yoshinori K. Okuji  <okuji@gnu.org>
+
+	* util/grub-image.in: Check stage2 instead of stage2.c to
+	determine where the script is invoked, because srcdir may not
+	be used for the compilation.
+	
 2002-01-20  Yoshinori K. Okuji  <okuji@gnu.org>
 
 	* grub/asmstub.c (console_putchar): When not using curses,
diff --git a/util/grub-image.in b/util/grub-image.in
index 136998f11..39b0af7db 100644
--- a/util/grub-image.in
+++ b/util/grub-image.in
@@ -2,7 +2,7 @@
 # grub-image - Create a GRUB boot filesystem image and tarball
 # Gordon Matzigkeit <gord@fig.org>, 2000-07-25
 #
-#   Copyright (C) 2000 Free Software Foundation, Inc.
+#   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ test "X$thisdir" = "X$0" && thisdir=.
 
 # See if we were invoked from within the build directory, and if so,
 # use the built files rather than the installed ones.
-if test -f $thisdir/../stage2/stage2.c; then
+if test -f $thisdir/../stage2/stage2; then
   grub_shell="$thisdir/../grub/grub"
   stage1dir="$thisdir/../stage1"
   stage2dir="$thisdir/../stage2"