diff --git a/ChangeLog b/ChangeLog
index d892b5198..9c0073459 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2000-02-03  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* stage2/cmdline.c (enter_cmdline): Set BUF_DRIVE to -1 before
+	running a command to invalidate the cache.
+	(run_script): Likewise.
+	* stage2/char_io.c (get_cmdline): Set BUF_DRIVE to -1 before the
+	completion to invalidate the cache.
+	Reported by Jeff Sheinberg <jeffsh@erols.com>.
+
+	* configure.in: Use AC_PATH_TOOL instead of AC_PATH_PROG.
+	* stage2/asm.S (chain_stage1): Prepend `*' to the argument for
+	ljmp.
+	(chain_stage2): Likewise.
+	(big_linux_boot): Likewise.
+	
 2000-01-19  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* util/grub-install.in (--root): Renamed to ...
diff --git a/configure b/configure
index 50992b693..bbe7b5a4a 100644
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using Autoconf version 2.14.1 
+# Generated automatically using Autoconf version 2.14a 
 # Copyright (C) 1992, 93, 94, 95, 96, 98, 1999 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -397,7 +397,7 @@ Some of the influent environment variables:$ac_arg_var_help"
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.14.1"
+    echo "configure generated by autoconf version 2.14a"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -1381,8 +1381,8 @@ fi
 
 
 if test "x$with_binutils" != x; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
 echo "configure:1388: checking for $ac_word" 1>&5
 if test "${ac_cv_path_RANLIB+set}" = set; then
@@ -1394,7 +1394,7 @@ else
   ;;
   *)
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy=""$with_binutils:$PATH""
+  ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_word"; then
@@ -1403,7 +1403,7 @@ else
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_RANLIB" && ac_cv_path_RANLIB=":"
+  test -z "$ac_cv_path_RANLIB" && ac_cv_path_RANLIB="${ac_tool_prefix}ranlib"
   ;;
 esac
 fi
@@ -1414,11 +1414,52 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+
+if test -z "$ac_cv_prog_RANLIB"; then
+  if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word... $ac_c" 1>&6
+echo "configure:1424: checking for $ac_word" 1>&5
+if test "${ac_cv_path_RANLIB+set}" = set; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$RANLIB" in
+  /* | ?:/*)
+  ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy=":"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_word"; then
+      ac_cv_path_RANLIB="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_RANLIB" && ac_cv_path_RANLIB="ranlib"
+  ;;
+esac
+fi
+RANLIB="$ac_cv_path_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  else
+    RANLIB=":"
+  fi
+fi
+
 else
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1422: checking for $ac_word" 1>&5
+echo "configure:1463: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1458,7 +1499,7 @@ if test "x$ac_cv_prog_gcc" = xyes; then
     STAGE1_CFLAGS="-O2"
     GRUB_CFLAGS="-O2"
     echo $ac_n "checking whether optimization for size works... $ac_c" 1>&6
-echo "configure:1462: checking whether optimization for size works" 1>&5
+echo "configure:1503: checking whether optimization for size works" 1>&5
 if test "${size_flag+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1466,14 +1507,14 @@ else
       saved_CFLAGS=$CFLAGS
       CFLAGS="-Os -g"
       cat >conftest.$ac_ext <<EOF
-#line 1470 "configure"
+#line 1511 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   size_flag=yes
 else
@@ -1503,10 +1544,10 @@ fi
 CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused"
 
 if test "x$with_binutils" != x; then
-  # Extract the first word of "objcopy", so it can be a program name with args.
-set dummy objcopy; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objcopy; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1510: checking for $ac_word" 1>&5
+echo "configure:1551: checking for $ac_word" 1>&5
 if test "${ac_cv_path_OBJCOPY+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1516,7 +1557,7 @@ else
   ;;
   *)
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy=""$with_binutils:$PATH""
+  ac_dummy="objcopy"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_word"; then
@@ -1525,6 +1566,7 @@ else
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_OBJCOPY" && ac_cv_path_OBJCOPY="${ac_tool_prefix}objcopy"
   ;;
 esac
 fi
@@ -1535,11 +1577,13 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+
+
 else
   # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objcopy; ac_word=$2
 echo $ac_n "checking for $ac_word... $ac_c" 1>&6
-echo "configure:1543: checking for $ac_word" 1>&5
+echo "configure:1587: checking for $ac_word" 1>&5
 if test "${ac_cv_prog_OBJCOPY+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1573,7 +1617,7 @@ fi
 # Defined in acinclude.m4.
 
 echo $ac_n "checking if C symbols get an underscore after compilation... $ac_c" 1>&6
-echo "configure:1577: checking if C symbols get an underscore after compilation" 1>&5
+echo "configure:1621: checking if C symbols get an underscore after compilation" 1>&5
 if test "${grub_cv_asm_uscore+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1586,7 +1630,7 @@ func (int *list)
 }
 EOF
 
-if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then
+if { ac_try='${CC-cc} ${CFLAGS} -S conftest.c'; { (eval echo configure:1634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.s; then
   true
 else
   { echo "configure: error: ${CC-cc} failed to produce assembly code" 1>&2; exit 1; }
@@ -1612,7 +1656,7 @@ fi
 echo "$ac_t""$grub_cv_asm_uscore" 1>&6
 
 echo $ac_n "checking whether ${OBJCOPY} works for absolute addresses... $ac_c" 1>&6
-echo "configure:1616: checking whether ${OBJCOPY} works for absolute addresses" 1>&5
+echo "configure:1660: checking whether ${OBJCOPY} works for absolute addresses" 1>&5
 if test "${grub_cv_prog_objcopy_absolute+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1624,21 +1668,21 @@ cmain (void)
 }
 EOF
 
-if { (eval echo configure:1628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then :
+if { (eval echo configure:1672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then :
 else
   { echo "configure: error: ${CC-cc} cannot compile C source code" 1>&2; exit 1; }
 fi
 grub_cv_prog_objcopy_absolute=yes
 for link_addr in 2000 8000 7C00; do
-  if { ac_try='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
+  if { ac_try='${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec'; { (eval echo configure:1678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
   else
     { echo "configure: error: ${CC-cc} cannot link at address $link_addr" 1>&2; exit 1; }
   fi
-  if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
+  if { ac_try='${OBJCOPY-objcopy} -O binary conftest.exec conftest'; { (eval echo configure:1682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then :
   else
     { echo "configure: error: ${OBJCOPY-objcopy} cannot create binary files" 1>&2; exit 1; }
   fi
-  if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+  if test ! -f conftest.old || { ac_try='cmp -s conftest.old conftest'; { (eval echo configure:1686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
     mv -f conftest conftest.old
   else
     grub_cv_prog_objcopy_absolute=no
@@ -1655,7 +1699,7 @@ fi
 
 
 echo $ac_n "checking whether addr32 must be in the same line as the instruction... $ac_c" 1>&6
-echo "configure:1659: checking whether addr32 must be in the same line as the instruction" 1>&5
+echo "configure:1703: checking whether addr32 must be in the same line as the instruction" 1>&5
 if test "${grub_cv_asm_prefix_requirement+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1664,7 +1708,7 @@ else
 l1:	addr32	movb	%al, l1
 EOF
 
-if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
+if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
   grub_cv_asm_prefix_requirement=yes
 else
   grub_cv_asm_prefix_requirement=no
@@ -1696,7 +1740,7 @@ echo "$ac_t""$grub_cv_asm_prefix_requirement" 1>&6
 
 
 echo $ac_n "checking for .code16 addr32 assembler support... $ac_c" 1>&6
-echo "configure:1700: checking for .code16 addr32 assembler support" 1>&5
+echo "configure:1744: checking for .code16 addr32 assembler support" 1>&5
 if test "${grub_cv_asm_addr32+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1711,7 +1755,7 @@ else
   sed -e s/@ADDR32@/addr32\;/ < conftest.s.in > conftest.s
 fi
 
-if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
+if { ac_try='${CC-cc} ${CFLAGS} -c conftest.s'; { (eval echo configure:1759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.o; then
   grub_cv_asm_addr32=yes
 else
   grub_cv_asm_addr32=no
@@ -1728,19 +1772,19 @@ fi
 
 
 echo $ac_n "checking if start is defined by the compiler... $ac_c" 1>&6
-echo "configure:1732: checking if start is defined by the compiler" 1>&5
+echo "configure:1776: checking if start is defined by the compiler" 1>&5
 if test "${grub_cv_check_start_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1737 "configure"
+#line 1781 "configure"
 #include "confdefs.h"
 
 int main() {
 asm ("incl start")
 ; return 0; }
 EOF
-if { (eval echo configure:1744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_start_symbol=yes
 else
@@ -1764,19 +1808,19 @@ echo "$ac_t""$grub_cv_check_start_symbol" 1>&6
 
 
 echo $ac_n "checking if _start is defined by the compiler... $ac_c" 1>&6
-echo "configure:1768: checking if _start is defined by the compiler" 1>&5
+echo "configure:1812: checking if _start is defined by the compiler" 1>&5
 if test "${grub_cv_check_uscore_start_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1773 "configure"
+#line 1817 "configure"
 #include "confdefs.h"
 
 int main() {
 asm ("incl _start")
 ; return 0; }
 EOF
-if { (eval echo configure:1780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_uscore_start_symbol=yes
 else
@@ -1805,19 +1849,19 @@ fi
 
 
 echo $ac_n "checking if __bss_start is defined by the compiler... $ac_c" 1>&6
-echo "configure:1809: checking if __bss_start is defined by the compiler" 1>&5
+echo "configure:1853: checking if __bss_start is defined by the compiler" 1>&5
 if test "${grub_cv_check_uscore_uscore_bss_start_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1814 "configure"
+#line 1858 "configure"
 #include "confdefs.h"
 
 int main() {
 asm ("incl __bss_start")
 ; return 0; }
 EOF
-if { (eval echo configure:1821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_uscore_uscore_bss_start_symbol=yes
 else
@@ -1841,19 +1885,19 @@ echo "$ac_t""$grub_cv_check_uscore_uscore_bss_start_symbol" 1>&6
 
 
 echo $ac_n "checking if _edata is defined by the compiler... $ac_c" 1>&6
-echo "configure:1845: checking if _edata is defined by the compiler" 1>&5
+echo "configure:1889: checking if _edata is defined by the compiler" 1>&5
 if test "${grub_cv_check_uscore_edata_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1850 "configure"
+#line 1894 "configure"
 #include "confdefs.h"
 
 int main() {
 asm ("incl _edata")
 ; return 0; }
 EOF
-if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_uscore_edata_symbol=yes
 else
@@ -1877,19 +1921,19 @@ echo "$ac_t""$grub_cv_check_uscore_edata_symbol" 1>&6
 
 
 echo $ac_n "checking if edata is defined by the compiler... $ac_c" 1>&6
-echo "configure:1881: checking if edata is defined by the compiler" 1>&5
+echo "configure:1925: checking if edata is defined by the compiler" 1>&5
 if test "${grub_cv_check_edata_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1886 "configure"
+#line 1930 "configure"
 #include "confdefs.h"
 
 int main() {
 asm ("incl edata")
 ; return 0; }
 EOF
-if { (eval echo configure:1893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_edata_symbol=yes
 else
@@ -1919,19 +1963,19 @@ fi
 
 
 echo $ac_n "checking if end is defined by the compiler... $ac_c" 1>&6
-echo "configure:1923: checking if end is defined by the compiler" 1>&5
+echo "configure:1967: checking if end is defined by the compiler" 1>&5
 if test "${grub_cv_check_end_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1928 "configure"
+#line 1972 "configure"
 #include "confdefs.h"
 
 int main() {
 asm ("incl end")
 ; return 0; }
 EOF
-if { (eval echo configure:1935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_end_symbol=yes
 else
@@ -1955,19 +1999,19 @@ echo "$ac_t""$grub_cv_check_end_symbol" 1>&6
 
 
 echo $ac_n "checking if _end is defined by the compiler... $ac_c" 1>&6
-echo "configure:1959: checking if _end is defined by the compiler" 1>&5
+echo "configure:2003: checking if _end is defined by the compiler" 1>&5
 if test "${grub_cv_check_uscore_end_symbol+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 1964 "configure"
+#line 2008 "configure"
 #include "confdefs.h"
 
 int main() {
 asm ("incl _end")
 ; return 0; }
 EOF
-if { (eval echo configure:1971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   grub_cv_check_uscore_end_symbol=yes
 else
@@ -2005,14 +2049,14 @@ fi
 # Get the filename or the whole disk and open it.
 # Known to work on NetBSD.
 echo $ac_n "checking for opendisk in -lutil... $ac_c" 1>&6
-echo "configure:2009: checking for opendisk in -lutil" 1>&5
+echo "configure:2053: checking for opendisk in -lutil" 1>&5
 if test "${ac_cv_lib_util_opendisk+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lutil  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2016 "configure"
+#line 2060 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2023,7 +2067,7 @@ int main() {
 opendisk()
 ; return 0; }
 EOF
-if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_util_opendisk=yes
 else
@@ -2048,14 +2092,14 @@ fi
 # Unless the user specify --without-curses, check for curses.
 if test "x$with_curses" != "xno"; then
   echo $ac_n "checking for wgetch in -lncurses... $ac_c" 1>&6
-echo "configure:2052: checking for wgetch in -lncurses" 1>&5
+echo "configure:2096: checking for wgetch in -lncurses" 1>&5
 if test "${ac_cv_lib_ncurses_wgetch+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2059 "configure"
+#line 2103 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2066,7 +2110,7 @@ int main() {
 wgetch()
 ; return 0; }
 EOF
-if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_ncurses_wgetch=yes
 else
@@ -2087,14 +2131,14 @@ EOF
 
 else
   echo $ac_n "checking for wgetch in -lcurses... $ac_c" 1>&6
-echo "configure:2091: checking for wgetch in -lcurses" 1>&5
+echo "configure:2135: checking for wgetch in -lcurses" 1>&5
 if test "${ac_cv_lib_curses_wgetch+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2098 "configure"
+#line 2142 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2105,7 +2149,7 @@ int main() {
 wgetch()
 ; return 0; }
 EOF
-if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_lib_curses_wgetch=yes
 else
@@ -2134,7 +2178,7 @@ fi
 
 # Check for headers.
 echo $ac_n "checking how to run the C preprocessor... $ac_c" 1>&6
-echo "configure:2138: checking how to run the C preprocessor" 1>&5
+echo "configure:2182: checking how to run the C preprocessor" 1>&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2149,13 +2193,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat >conftest.$ac_ext <<EOF
-#line 2153 "configure"
+#line 2197 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2166,13 +2210,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat >conftest.$ac_ext <<EOF
-#line 2170 "configure"
+#line 2214 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2183,13 +2227,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat >conftest.$ac_ext <<EOF
-#line 2187 "configure"
+#line 2231 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2217,17 +2261,17 @@ for ac_header in string.h strings.h ncurses/curses.h ncurses.h curses.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
 echo $ac_n "checking for $ac_header... $ac_c" 1>&6
-echo "configure:2221: checking for $ac_header" 1>&5
+echo "configure:2265: checking for $ac_header" 1>&5
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 2226 "configure"
+#line 2270 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2570,7 +2614,7 @@ Files to instantiate:
 Report bugs to <bug-autoconf@gnu.org>."
 
 ac_cs_version="\\
-$CONFIG_STATUS generated by autoconf version 2.14.1.
+$CONFIG_STATUS generated by autoconf version 2.14a.
 Configured on host `(hostname || uname -n) 2>/dev/null | sed 1q` by running
   $0 $ac_configure_args"
 
diff --git a/configure.in b/configure.in
index 8d630c285..2c786eb42 100644
--- a/configure.in
+++ b/configure.in
@@ -58,7 +58,7 @@ AC_ARG_WITH(binutils,
   [  --with-binutils=DIR     search the directory DIR to find binutils])
 
 if test "x$with_binutils" != x; then
-  AC_PATH_PROG(RANLIB, ranlib, :, "$with_binutils:$PATH")
+  AC_PATH_TOOL(RANLIB, ranlib, :, "$with_binutils:$PATH")
 else
   AC_PROG_RANLIB
 fi
@@ -95,7 +95,7 @@ AC_SUBST(GRUB_CFLAGS)
 CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused"
 
 if test "x$with_binutils" != x; then
-  AC_PATH_PROG(OBJCOPY, objcopy, , "$with_binutils:$PATH")
+  AC_PATH_TOOL(OBJCOPY, objcopy, , "$with_binutils:$PATH")
 else
   AC_CHECK_TOOL(OBJCOPY, objcopy)
 fi
diff --git a/stage2/asm.S b/stage2/asm.S
index 407f2c59b..8098f2f4c 100644
--- a/stage2/asm.S
+++ b/stage2/asm.S
@@ -694,7 +694,7 @@ ENTRY(chain_stage1)
 	call	EXT_C(prot_to_real)
 	.code16
 
-	DATA32	ADDR32	ljmp	(offset)
+	DATA32	ADDR32	ljmp	*(offset)
 	.code32
 #endif /* STAGE1_5 */
 
@@ -734,7 +734,7 @@ ENTRY(chain_stage2)
 	call	EXT_C(prot_to_real)
 	.code16
 
-	DATA32	ADDR32	ljmp	(offset)
+	DATA32	ADDR32	ljmp	*(offset)
 
 	.code32
 #endif /* STAGE1_5 */
@@ -1651,7 +1651,7 @@ ENTRY(big_linux_boot)
 	movw	%ax, %ss
 
 	/* jump to start */
-	DATA32	ADDR32	ljmp	(offset)
+	DATA32	ADDR32	ljmp	*(offset)
 	.code32
 
 
diff --git a/stage2/char_io.c b/stage2/char_io.c
index 09810194a..d17a5c116 100644
--- a/stage2/char_io.c
+++ b/stage2/char_io.c
@@ -394,6 +394,10 @@ get_cmdline (char *prompt, char *cmdline, int maxlen,
 		for (i = lpos; i > 0 && buf[i - 1] != ' '; i--)
 		  ;
 
+		/* Invalidate the cache, because the user may exchange
+		   removable disks.  */
+		buf_drive = -1;
+
 		/* Copy this word to COMPLETION_BUFFER and do the
 		   completion.  */
 		grub_memmove (completion_buffer, buf + i, lpos - i);
diff --git a/stage2/cmdline.c b/stage2/cmdline.c
index a53ec44e9..ab1adb234 100644
--- a/stage2/cmdline.c
+++ b/stage2/cmdline.c
@@ -143,6 +143,10 @@ enter_cmdline (char *heap, int forever)
 	  continue;
 	}
 
+      /* Invalidate the cache, because the user may exchange removable
+	 disks.  */
+      buf_drive = -1;
+
       /* Run BUILTIN->FUNC.  */
       arg = skip_to (1, heap);
       (builtin->func) (arg, BUILTIN_CMDLINE);
@@ -208,6 +212,10 @@ run_script (char *script, char *heap)
 	  continue;
 	}
 
+      /* Invalidate the cache, because the user may exchange removable
+	 disks.  */
+      buf_drive = -1;
+
       /* Run BUILTIN->FUNC.  */
       arg = skip_to (1, heap);
       (builtin->func) (arg, BUILTIN_CMDLINE);