diff --git a/bootstrap b/bootstrap
index 2a1734c..3cbe05e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,45 +1,46 @@
 #! /bin/sh
+
+##  bootstrap file for ttyvaders -- Sam Hocevar <sam@zoy.org>
+##  $Id$
+
 set -x
+set -e
 
-rm -f aclocal.m4 configure libtool ltconfig ltmain.sh config.log
-rm -f autotools/compile autotools/config.guess autotools/config.sub autotools/missing autotools/mkinstalldirs autotools/depcomp autotools/install-sh
+# Get a sane environment, just in case
+LANG=C
+export LANG
+CYGWIN=binmode
+export CYGWIN
 
 # Check for automake
-amvers="none"
-if automake-1.7 --version >/dev/null 2>&1
-then
+amvers="no"
+if automake-1.7 --version >/dev/null 2>&1; then
   amvers="-1.7"
-else
-  if automake-1.6 --version >/dev/null 2>&1
-  then
-    amvers="-1.6"
+elif automake-1.6 --version >/dev/null 2>&1; then
+  amvers="-1.6"
+elif automake-1.5 --version >/dev/null 2>&1; then
+  amvers="-1.5"
+elif automake --version > /dev/null 2>&1; then
+  amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
+  if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
+    amvers="no"
   else
-    if automake-1.5 --version >/dev/null 2>&1
-    then
-      amvers="-1.5"
-    else
-      if automake --version > /dev/null 2>&1
-      then
-        amvers=`automake --version | sed -e '1s/[^0-9]*//' -e q`
-  
-        if expr "$amvers" "<" "1.5" > /dev/null 2>&1
-        then amvers="none"
-        else amvers=""
-        fi        
-      fi
-    fi 
+    amvers=""
   fi
 fi
 
-if test x$amvers = xnone
-then
+if test "$amvers" = "no"; then
   set +x
-  echo "you need automake version 1.5 or later"
+  echo "$0: you need automake version 1.5 or later"
   exit 1
 fi
 
-aclocal${amvers} -I autotools || exit 1
-autoheader || exit 1
-automake${amvers} --add-missing --copy || exit 1
-autoconf || exit 1
-rm -f config.cache
+# Remove old cruft
+rm -f aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh INSTALL
+(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile ltmain.sh depcomp install-sh)
+
+aclocal${amvers}
+autoconf
+autoheader
+automake${amvers} --add-missing --copy
+
diff --git a/configure.ac b/configure.ac
index 3b57a5b..2a574c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Autoconf settings for ttyvaders
+# $Id$
 
 AC_INIT(ttyvaders,0.0cvs-20021223)