diff --git a/guacamole/.gitignore b/guacamole/.gitignore
index c6e9f9136..d33efd50a 100644
--- a/guacamole/.gitignore
+++ b/guacamole/.gitignore
@@ -18,6 +18,7 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache/
+m4/
 config.guess
 config.log
 config.status
diff --git a/guacamole/libguac/Makefile.am b/guacamole/libguac/Makefile.am
index b1a7ed4de..f20371ccc 100644
--- a/guacamole/libguac/Makefile.am
+++ b/guacamole/libguac/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 
+ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = -Werror -Wall -Iinclude
 
 libguacincdir = $(includedir)/guacamole
diff --git a/guacamole/libguac/configure.in b/guacamole/libguac/configure.in
index 5dd484753..03a5534e1 100644
--- a/guacamole/libguac/configure.in
+++ b/guacamole/libguac/configure.in
@@ -3,6 +3,7 @@
 
 AC_INIT(src/client.c)
 AM_INIT_AUTOMAKE(libguac, 0.0.0)
+AC_CONFIG_MACRO_DIR([m4])
 
 # Checks for programs.
 AC_PROG_CC
diff --git a/guacamole/proxy-clients/vnc/Makefile.am b/guacamole/proxy-clients/vnc/Makefile.am
index 89dcf95a2..e2a942119 100644
--- a/guacamole/proxy-clients/vnc/Makefile.am
+++ b/guacamole/proxy-clients/vnc/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 
+ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = -Werror -Wall
 
 lib_LTLIBRARIES = libguac_client_vnc.la
diff --git a/guacamole/proxy-clients/vnc/configure.in b/guacamole/proxy-clients/vnc/configure.in
index e5a3452dc..47baf14a9 100644
--- a/guacamole/proxy-clients/vnc/configure.in
+++ b/guacamole/proxy-clients/vnc/configure.in
@@ -3,6 +3,7 @@
 
 AC_INIT(src/vnc_client.c)
 AM_INIT_AUTOMAKE([libguac_client_vnc], 0.0.0)
+AC_CONFIG_MACRO_DIR([m4])
 
 # Checks for programs.
 AC_PROG_CC