diff --git a/autogen.sh b/autogen.sh
index 4259ed2..d5d5885 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,7 +36,7 @@ fi
 
 echo "Running aclocal ..."
 aclocal 
-if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+if grep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null; then
   echo "Running autoheader..."
   autoheader
 fi
diff --git a/configure.in b/configure.in
index 9465101..0ce50a7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,10 @@
 dnl Process this file with autoconf  2.50 (or higher) to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT
+AC_INIT(lcdproc, 0.5dev, lcdproc@lists.omnipotent.net)
 AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
-AM_INIT_AUTOMAKE(lcdproc, 0.5dev)
+AM_INIT_AUTOMAKE
 
-AM_CONFIG_HEADER(config.h)
-AC_EXEEXT
+AC_CONFIG_HEADERS(config.h)
 
 AC_CANONICAL_HOST
 case "$host" in