diff --git a/src/bootstrap b/src/bootstrap
index 207dc4c2..02163035 100755
--- a/src/bootstrap
+++ b/src/bootstrap
@@ -1,5 +1,6 @@
 #! /bin/sh
 
+: ${AUTORECONF="autoreconf${AC_VER}"}
 : ${AUTOHEADER="autoheader${AC_VER}"}
 : ${AUTOCONF="autoconf${AC_VER}"}
 : ${ACLOCAL="aclocal${AM_VER}"}
@@ -17,9 +18,6 @@ rm -rf autom4te.cache
 # probe for that
 LIBTOOLIZE=libtoolize
 glibtoolize --version > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize
-${LIBTOOLIZE}
+export LIBTOOLIZE
 
-${ACLOCAL}
-${AUTOHEADER}
-${AUTOCONF}
-${AUTOMAKE} -a -c
+${AUTORECONF} -i
diff --git a/src/configure.ac b/src/configure.ac
index 9734c312..deab8b5c 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -20,7 +20,7 @@
 # $Id$
 #
 
-# Process this file with autoconf to produce a configure script.
+# Process this file with autoreconf to produce a configure script.
 
 AC_PREREQ(2.60)
 AC_INIT([avrdude],