3 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 993ecab5..b80fec7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 @SET_MAKE@
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 if BUILD_PANEL_PLUGINS
 plugins_dir = panel-plugins
 endif
diff --git a/autogen.sh b/autogen.sh
index 6bc0c8a4..8104646d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,6 @@ EOF
   exit 1
 }
 
+test -d m4 || mkdir m4
+
 xdt-autogen $@
diff --git a/configure.ac.in b/configure.ac.in
index 685cda58..46b1bbb1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -8,6 +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.69])
+AC_CONFIG_MACRO_DIR([m4])
 
 # subdir-objects is currently broken, see
 # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928