diff --git Makefile.am Makefile.am
index 28036bf..a2cab5e 100644
--- Makefile.am
+++ Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS=-I m4
+
 SUBDIRS = \
 	camel mail \
 	addressbook calendar \
diff --git configure.ac configure.ac
index ca883a5..30c979f 100644
--- configure.ac
+++ configure.ac
@@ -1,11 +1,16 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.52)
-
+dnl Evolution exchange version
 m4_define([eex_version], [2.29.1])
 
-AC_INIT(evolution-exchange, [eex_version], http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution%20Exchange)
+dnl Initializes automake/autoconf
+AC_PREREQ(2.58)
+AC_INIT([evolution-exchange], [eex_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution%20Exchange])
+AM_INIT_AUTOMAKE([gnu 1.9])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(storage)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AC_CONFIG_HEADERS(config.h)
+
+dnl Automake 1.11 - Silent Build Rules
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl Required Package Versions
 m4_define([glib_minimum_version], [2.16.0])
@@ -18,11 +23,6 @@ m4_define([libgnomeui_minimum_version], [2.0.0])        # XXX Just a Guess
 m4_define([libxml_minimum_version], [2.0.0])            # XXX Just a Guess
 m4_define([libsoup_minimum_version], [2.3.0])
 
-AM_CONFIG_HEADER(config.h)
-
-dnl Automake 1.11 - Silent Build Rules
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
 AC_ARG_WITH(e2k-debug,     [  --with-e2k-debug              Allow debugging])
 case $withval in
 no)
