diff --git a/Makefile.am b/Makefile.am
index 2a5dd50..56a3ec7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = themes po
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 MAINTAINERCLEANFILES =			\
 	Makefile.in			\
 	aclocal.m4			\
diff --git a/configure.ac b/configure.ac
index 1b00ad8..bd6d957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ(2.53)
 AC_INIT([gnome-themes-standard], [3.9.90],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-themes-standard])
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE([1.9 tar-ustar foreign dist-xz no-dist-gzip])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
