diff --git a/Makefile.am b/Makefile.am
index a6aa5e046c636b04d98295bc11659194a616f31a..c37ebadb9b3f3119fc1c8060c54ad533633496f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 # we need the module file to be able to build via dunecontrol
 EXTRA_DIST=dune.module
 
-SUBDIRS = src m4 dune-solvers
+SUBDIRS = src m4 dune
 
 if BUILD_DOCS
 SUBDIRS += doc
diff --git a/configure.ac b/configure.ac
index 0faa6734b987480d99352bae74259c745c50714d..3897be2ce07bf655dc0798985dc9ad3c5df846f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,13 @@ LIBS="$DUNE_LIBS"
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
-  dune-solvers/Makefile
-  dune-solvers/common/Makefile
-  dune-solvers/iterationsteps/Makefile
-  dune-solvers/norms/Makefile
-  dune-solvers/solvers/Makefile
-  dune-solvers/transferoperators/Makefile
+  dune/Makefile
+  dune/solvers/Makefile
+  dune/solvers/common/Makefile
+  dune/solvers/iterationsteps/Makefile
+  dune/solvers/norms/Makefile
+  dune/solvers/solvers/Makefile
+  dune/solvers/transferoperators/Makefile
   doc/Makefile
   doc/doxygen/Makefile
   m4/Makefile
diff --git a/dune/Makefile.am b/dune/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..6d4b6b1938084b4aa717fe17fed96308eb28c7e9
--- /dev/null
+++ b/dune/Makefile.am
@@ -0,0 +1,5 @@
+# $Id: $
+
+SUBDIRS = solvers
+
+include $(top_srcdir)/am/global-rules