diff --git a/Makefile.am b/Makefile.am
index 6aef17a..e9290de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS =								\
 	po								\
 	src
diff --git a/autogen.sh b/autogen.sh
index 55007f7..cc184c6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,5 +10,7 @@ EOF
   exit 1
 }
 
+test -d m4 || mkdir m4
+
 XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" \
 exec xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index 0df57a1..baef103 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -21,7 +21,8 @@ AC_COPYRIGHT([Copyright (c) 2006-2008
         The Xfce development team. All rights reserved.])
 AC_INIT([Xfce4 Taskmanager], [taskmanager_version], [http://bugzilla.xfce.org/], [xfce4-taskmanager],
         [http://goodies.xfce.org/projects/applications/xfce4-taskmanager])
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET()
 AC_REVISION([taskmanager_version_build])