diff --git a/bin/dunecontrol b/bin/dunecontrol
index 4e563141351706f473d6d9fda913018e53d0e5e3..513ef5b0f6949f25c51800b900a952a5df38f4a6 100755
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -581,12 +581,11 @@ run_default_configure () {
       fi
       if test x$module = x$m; then continue; fi # skip myself
       name=$(eval "echo \$NAME_$m")
-      if test -d "$path/m4"; then
-          ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $path/m4"
-      fi
-      if test -d "$path/share/aclocal"; then
-          ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $path/share/aclocal"
-      fi
+      for dir in $path/m4 $path/share/dune/aclocal $path/share/aclocal; do
+        if test -d "$dir"; then
+            ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir"
+        fi
+      done
       if test -d "$path/$BUILDDIR"; then
         PARAMS="$PARAMS \"--with-$name=$path/$BUILDDIR\""
       else
diff --git a/bin/duneproject b/bin/duneproject
index e1bd0ed0725fc7d6b77346d214b40a442dabe691..2a00c842289dc0fd768d4dac06e90030ce775b12 100755
--- a/bin/duneproject
+++ b/bin/duneproject
@@ -680,7 +680,7 @@ echo "- $PROJECT/m4/Makefile.am"
 cat> "$PROJECT/m4/Makefile.am" << CC_DELIM
 M4FILES = $MODULE.m4
 
-aclocaldir = \$(datadir)/aclocal
+aclocaldir = \$(datadir)/dune/aclocal
 aclocal_DATA = \$(M4FILES)
 
 EXTRA_DIST = \$(M4FILES) CMakeLists.txt
@@ -692,7 +692,7 @@ CC_DELIM
 echo "- $PROJECT/m4/CMakeLists.txt"
 cat> "$PROJECT/m4/CMakeLists.txt" << CC_DELIM
 
-install(PROGRAMS $MODULE.m4 DESTINATION share/aclocal)
+install(PROGRAMS $MODULE.m4 DESTINATION share/dune/aclocal)
 
 CC_DELIM
 
diff --git a/m4/CMakeLists.txt b/m4/CMakeLists.txt
index 671879f35ab643242e032e403ab3f11a2743f6d8..827c243a8fc8a4277383f943d9b6a66d120e4845 100644
--- a/m4/CMakeLists.txt
+++ b/m4/CMakeLists.txt
@@ -47,5 +47,5 @@ install(PROGRAMS
         shared_ptr.m4
         umfpack.m4
         xdr.m4
-	DESTINATION share/aclocal
+	DESTINATION share/dune/aclocal
 )
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 259581fe4496f14118da30ac9126f50b321cbe11..62d78d4a1e4bd355d1bb10fb4379dac7134018d8 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -52,7 +52,7 @@ ALLM4S = 					\
         umfpack.m4                              \
 	xdr.m4
 
-aclocaldir = $(datadir)/aclocal
+aclocaldir = $(datadir)/dune/aclocal
 aclocal_DATA = $(ALLM4S)
 
 EXTRA_DIST = CMakeLists.txt $(ALLM4S)