diff --git a/autogen.sh b/autogen.sh
index 5c6c465..b1376df 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,69 +1,3 @@
-#!/bin/sh
-#
-# autogen.sh glue for hplip
-#
-# HPLIP used to have five or so different autotools trees.  Upstream
-# has reduced it to two.  Still, this script is capable of cleaning
-# just about any possible mess of autoconf files.
-#
-# BE CAREFUL with trees that are not completely automake-generated,
-# this script deletes all Makefile.in files it can find.
-#
-# Requires: automake 1.9, autoconf 2.57+
-# Conflicts: autoconf 2.13
-set -e
-
-# Refresh GNU autotools toolchain.
-echo Cleaning autotools files...
-find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
-find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
-	-o -name depcomp -o -name ltmain.sh -o -name configure \
-	-o -name config.sub -o -name config.guess \
-	-o -name Makefile.in \) -print0 | xargs -0 rm -f
-
-echo Running autoreconf...
-autoreconf -v --force --install
-
-# For the Debian package build
-test -d debian && {
-	# link these in Debian builds
-	rm -f config.sub config.guess
-	ln -s /usr/share/misc/config.sub .
-	ln -s /usr/share/misc/config.guess .
-
-	# refresh list of executable scripts, to avoid possible breakage if
-	# upstream tarball does not include the file or if it is mispackaged
-	# for whatever reason.
-	[ "$1" == "updateexec" ] && {
-		echo Generating list of executable files...
-		rm -f debian/executable.files
-		find -type f -perm +111 ! -name '.*' -fprint debian/executable.files
-	}
-
-	# Remove any files in upstream tarball that we don't have in the Debian
-	# package (because diff cannot remove files)
-	version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]\+$//'`
-	source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '`
-	if test -r ../${source}_${version}.orig.tar.gz ; then
-		echo Generating list of files that should be removed...
-		rm -f debian/deletable.files
-		touch debian/deletable.files
-		[ -e debian/tmp ] && rm -rf debian/tmp
-		mkdir debian/tmp
-		( cd debian/tmp ; tar -zxf ../../../${source}_${version}.orig.tar.gz )
-		find debian/tmp/ -type f ! -name '.*' -print0 | xargs -0 -ri echo '{}' | \
-		  while read -r i ; do
-			if test -e "${i}" ; then
-				filename=$(echo "${i}" | sed -e 's#.*debian/tmp/[^/]\+/##')
-				test -e "${filename}" || echo "${filename}" >>debian/deletable.files
-			fi
-		  done
-		rm -fr debian/tmp
-	else
-		echo Emptying list of files that should be deleted...
-		rm -f debian/deletable.files
-		touch debian/deletable.files
-	fi
-}
-
-exit 0
+#! /bin/sh
+autoreconf -v --install || exit 1
+./configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index b4f6664..4b340cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(libmodbus, 2.0, stephane.raimbault@gmail.com)
-AM_INIT_AUTOMAKE(libmodbus, 2.0.0)
+AC_INIT(libmodbus, 2.0.0, stephane.raimbault@gmail.com)
+AC_CONFIG_SRCDIR([modbus/modbus.c])
+AM_INIT_AUTOMAKE
 AM_DISABLE_STATIC
 
 # Checks for programs.
@@ -26,8 +27,8 @@ AC_FUNC_SELECT_ARGTYPES
 AC_CHECK_FUNCS([inet_ntoa memset select socket])
 
 AC_OUTPUT([
-Makefile
-modbus/Makefile
-tests/Makefile
-modbus.pc
+        Makefile
+        modbus/Makefile
+        tests/Makefile
+        modbus.pc
 ])