diff --git a/ChangeLog b/ChangeLog
index a58cd0c59..95e24ab38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-17  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
+
+	* acinclude.m4 (grub_ASM_EXT_C): Do not overrun the comman
+	shift. Reported by Pavel Roskin <pabel_roskin@geocities.com>.
+
 1999-05-14  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
 	* docs/Makefile.am (info_TEXINFOS): Added multiboot.texi.
diff --git a/acinclude.m4 b/acinclude.m4
index 3090c8674..31e8d7b5d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -25,7 +25,8 @@ if test -z "[$]1"; then
   AC_MSG_ERROR([C symbol not found])
 fi
 grub_cv_asm_ext_c="[$]1"
-while shift; do
+while test [$]# != 0; do
+  shift
   dummy=[$]1
   if test ! -z ${dummy}; then
     grub_cv_asm_ext_c="$grub_cv_asm_ext_c ## $dummy"
diff --git a/configure b/configure
index bedcf5ac9..b59a8130e 100644
--- a/configure
+++ b/configure
@@ -608,7 +608,7 @@ echo "$ac_t""$INSTALL" 1>&6
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'