diff --git a/autogen.sh b/autogen.sh
index 4558365013802d4ffe24fa43e7bb11f33fd8f226..956cc9374580ddad3a2e4019e627ff08583a2e26 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,6 +17,4 @@ EOF
   exit 1
 }
 
-test -d m4 || mkdir m4
-
 xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index 125cfe2a90f4818d113340a5afec6d1a98dc2571..3ebef1459859d634ce7ec81b8b1490284e23f97c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -8,7 +8,7 @@ m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_versio
 
 AC_INIT([xfce4-power-manager],[xfpm_version],[http://bugzilla.xfce.org/])
 AC_PREREQ([2.60])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([m4])
 
 # subdir-objects is currently broken, see
 # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928