diff --git a/Makefile.am b/Makefile.am
index 62ad6b479..f56d410b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@ include $(top_srcdir)/Makefile.am.common
 
 SUBDIRS	= include lib kuser kdc admin kadmin kpasswd appl doc
 
-ACLOCAL = @ACLOCAL@ -I cf
+## ACLOCAL = @ACLOCAL@ -I cf
+ACLOCAL_AMFLAGS = -I cf
 
 EXTRA_DIST = Makefile.am.common krb5.conf
diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
index 132726373..d1bbc1d46 100644
--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 AM_CFLAGS += $(WFLAGS)
 
-ACLOCAL = @ACLOCAL@ -I cf
+## ACLOCAL = @ACLOCAL@ -I cf
+ACLOCAL_AMFLAGS = -I ../../cf
 
 CLEANFILES = roken.h make-roken.c