diff --git a/Makefile.am b/Makefile.am
index 93e9557..749474a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 # $Id$
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = lib sample
 
 docdir = $(prefix)/share/doc/@PACKAGE@
diff --git a/configure.in b/configure.ac
similarity index 96%
rename from configure.in
rename to configure.ac
index 4848e11..4090bc6 100644
--- a/configure.in
+++ b/configure.ac
@@ -10,15 +10,16 @@ dnl INCLUDES
 dnl ------------------------------------------------------------------
 dnl Initialization for autoconf
 dnl ------------------------------------------------------------------
-AC_PREREQ(2.59)
-AC_INIT
+AC_PREREQ([2.69])
+AC_INIT(liblbfgs, 1.10)
 AC_CONFIG_SRCDIR([lib/lbfgs.c])
+AC_CONFIG_MACRO_DIR([m4])
 
 
 dnl ------------------------------------------------------------------
 dnl Initialization for automake
 dnl ------------------------------------------------------------------
-AM_INIT_AUTOMAKE(liblbfgs, 1.10)
+AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE
 
@@ -26,7 +27,7 @@ AM_MAINTAINER_MODE
 dnl ------------------------------------------------------------------
 dnl Checks for program
 dnl ------------------------------------------------------------------
-AC_PROG_LIBTOOL
+LT_INIT
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET