diff --git a/Makefile.am b/Makefile.am
index 07c5d292..5bb0a2d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 # create default-config.h
 BUILT_SOURCES = default-config.h default-theme.h irssi-version.h
diff --git a/configure.ac b/configure.ac
index 61af4f89..d409be36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,7 @@ AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
 
 AC_CONFIG_HEADERS([irssi-config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.9 no-define foreign])
 
 AM_MAINTAINER_MODE
diff --git a/curses.m4 b/m4/curses.m4
similarity index 100%
rename from curses.m4
rename to m4/curses.m4
diff --git a/glib-2.0.m4 b/m4/glib-2.0.m4
similarity index 100%
rename from glib-2.0.m4
rename to m4/glib-2.0.m4