diff --git a/am/top-rules b/am/top-rules
index dc0f2ea8fe307da3ad220e47d755c9595b1402b0..5ff377971617bd9ed526c7f6abf8e28db0fa3c79 100644
--- a/am/top-rules
+++ b/am/top-rules
@@ -1,6 +1,6 @@
 # -*-makefile-*-
 
-ACLOCAL_AMFLAGS=-I .
+ACLOCAL_AMFLAGS=@ACLOCAL_AMFLAGS@
 DUNECONTROL=@DUNE_COMMON_ROOT@/bin/dunecontrol
 
 all-am: dependencies.m4
diff --git a/m4/dune_all.m4 b/m4/dune_all.m4
index c9fa72f6edfbbc0ce685a3346c87d75c3c5dcffb..15764e3f46cd8620f01695e999a2b9ecd48eca91 100644
--- a/m4/dune_all.m4
+++ b/m4/dune_all.m4
@@ -1,4 +1,4 @@
-# $Id: dune_all.m4 5164 2008-04-21 14:08:28Z christi $
+# $Id$
 
 # this meta-check calls everything needed for Dune to work and all
 # possible components. Applications should use this so that
@@ -41,6 +41,8 @@ AC_DEFUN([DUNE_CHECK_ALL],[
   AC_SUBST(ALL_PKG_LDFLAGS, "$LDFLAGS $DUNE_PKG_LDFLAGS")
   AC_SUBST(ALL_PKG_CPPFLAGS, "$CPPFLAGS $DUNE_PKG_CPPFLAGS")
 
+  AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_AMFLAGS")
+
   AC_SUBST(am_dir, $DUNE_COMMON_ROOT/am)
 ])