diff --git a/buddy/ChangeLog b/buddy/ChangeLog
index d451d8bff..650dbd68e 100644
--- a/buddy/ChangeLog
+++ b/buddy/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-28  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	* configure.ac: Switch from Libtool 1.5.x to Libtool 2.x, and
+	add an AC_CONFIG_MACRO_DIR call.
+
 2009-06-12  Guillaume Sadegh  <sadegh@lrde.epita.fr>
 
 	Adjust to support the Intel compiler (icc).
diff --git a/buddy/configure.ac b/buddy/configure.ac
index 37bbf525f..55549c151 100644
--- a/buddy/configure.ac
+++ b/buddy/configure.ac
@@ -1,6 +1,7 @@
 AC_PREREQ([2.57])
 AC_INIT([buddy], [2.3a])
 AC_CONFIG_AUX_DIR([tools])
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign nostdinc no-define 1.7.3])
 
 AC_PROG_CC
@@ -10,8 +11,7 @@ AC_PROG_YACC
 
 AC_PROG_CXX
 
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
+LT_INIT([win32-dll])
 
 buddy_INTEL
 buddy_DEBUG_FLAGS