diff --git a/configure.ac b/configure.ac
index bfe1f58..19916f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,17 +16,14 @@ dnl Revision 1.1.1.1  2004/01/28 16:21:41  alexios
 dnl Initial imported revision.
 dnl
 
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(src/evrouter.c)
-
-AC_CANONICAL_SYSTEM
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
 dnl Magic to obtain the version from debian/changelog, where it should
 dnl reside.
-AM_INIT_AUTOMAKE($PACKAGE,$$PACKAGE_VERSION)
+AC_INIT([evrouter], [0.4])
+
+dnl Process this file with autoconf to produce a configure script.
+
+AC_CONFIG_SRCDIR([src/evrouter.c])
+AM_INIT_AUTOMAKE
 
 dnl Essential info (some autodetected)
 PACKAGE=`grep urgency= debian/changelog|head -1 | sed 's/ .*//'`
@@ -40,11 +37,6 @@ AC_SUBST(PACKAGE_VERSION)
 dnl AC_SUBST(LIBVERSION)
 AC_SUBST(ISODATE)
 
-dnl Every other copy of the package version number gets its value from
-dnl here (BUT NOT the files in debian/)
-
-AM_INIT_AUTOMAKE(evrouter, $PACKAGE_VERSION)
-
 dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
 AM_CONFIG_HEADER(config.h)
 
@@ -53,7 +45,6 @@ AC_SUBST(VERSION)
 ISODATE=`date +%Y-%m-%d`
 AC_SUBST(ISODATE)
 
-AC_CANONICAL_HOST
 AC_C_CONST
 
 dnl Checks for programs.