diff --git a/Makefile.am b/Makefile.am
index 02213fd9..e4a87daf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,5 @@ icondir = $(datadir)/pixmaps
 
 util_DATA = hexchat.desktop
 utildir = $(datadir)/applications
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.in b/configure.in
index 4f18d92b..2a93945f 100644
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,7 @@ AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.in])
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define])