diff --git a/Makefile.am b/Makefile.am
index fff870712a855da3b777f117ab26dfa257aeda8b..ee206db9dc4a6bd78763c21c629ba412963b3e97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,10 +24,6 @@ SUBDIRS =								\
 	tests								\
 	po
 
-AUTOMAKE_OPTIONS =							\
-	1.8								\
-	dist-bzip2
-
 distclean-local:
 	rm -rf *.spec *.cache *~
 
diff --git a/configure.in.in b/configure.ac.in
similarity index 95%
rename from configure.in.in
rename to configure.ac.in
index 106a19c31439114cb584ebdd021ed0689605dee9..c0c20d1e638e93bd3733d691146d1c33b05d3a3d 100644
--- a/configure.in.in
+++ b/configure.ac.in
@@ -46,8 +46,8 @@ AC_CANONICAL_TARGET()
 dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
-AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -74,9 +74,7 @@ AC_SUBST([GARCON_VERSION_API])
 dnl *******************************
 dnl *** Check for UNIX variants ***
 dnl *******************************
-AC_AIX()
 AC_ISC_POSIX()
-AC_MINIX()
 
 dnl ********************************
 dnl *** Check for basic programs ***
@@ -85,9 +83,14 @@ AM_PROG_AS()
 AC_PROG_CC()
 AC_PROG_INSTALL()
 AC_PROG_INTLTOOL([0.31], [no-xml])
-AC_PROG_LIBTOOL()
 AM_PROG_CC_C_O()
 
+dnl **************************
+dnl *** Initialize libtool ***
+dnl **************************
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
 dnl ***************************************
 dnl *** Check for standard header files ***
 dnl ***************************************
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 1decf21512833d282411832e5f1dcce91a50a6d7..f218185e1a36a1acc3787eca2a7df2cee1251cd5 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -55,7 +55,7 @@ content_files =								\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES =	 							\
+AM_CPPFLAGS =	 							\
 	-I$(top_srcdir) 						\
 	-I$(top_builddir) 						\
 	$(GIO_CFLAGS)							\
diff --git a/garcon/Makefile.am b/garcon/Makefile.am
index 68b037c09e70a167477ca9dc5b34809c0c4824d9..6ead84751ea56fb2859d7e11dd33921d9c9d1752 100644
--- a/garcon/Makefile.am
+++ b/garcon/Makefile.am
@@ -17,7 +17,7 @@
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-INCLUDES = 								\
+AM_CPPFLAGS = 								\
 	-I$(top_srcdir)							\
 	-DGARCON_COMPILATION						\
 	-DGARCON_VERSION_API=\"$(GARCON_VERSION_API)\"			\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e399e803a67b9d95aa49901a2eeb488049ca522a..77ecb6d78a428c291a8f55e1f755d84dc1646cb7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,7 +17,7 @@
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"garcon-tests\"