diff --git a/Makefile.am b/Makefile.am
index 10085167bade214073e28a9bddf2e42975f1f766..12e3d2210178639ca16a0341554b6a8a20fc203e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ nonlinelast_SOURCES     = nonlinelast.cc
 viscoelast_SOURCES      = viscoelast.cc
 
 # Build the unit tests as well
-SUBDIRS = test m4
+SUBDIRS = test m4 dune
 
 # don't follow the full GNU-standard
 # we need automake 1.5
diff --git a/configure.ac b/configure.ac
index 8cde0c35a498e3bf6c9a196e2d2eaa6f55befacf..db1e234466bd27805c86f6f80d2c2bb19667767c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,8 @@ AC_SUBST(AM_LDFLAGS, $DUNE_LDFLAGS)
 LIBS="$DUNE_LIBS"
 
 AC_CONFIG_FILES([Makefile
+                 dune/Makefile
+                 dune/elasticity/Makefile
                  test/Makefile
                  m4/Makefile
                  elasticity.pc])
diff --git a/dune/Makefile.am b/dune/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..6d23d006fff391d9e008ea62add929268c7b4824
--- /dev/null
+++ b/dune/Makefile.am
@@ -0,0 +1,5 @@
+# $Id: $
+
+SUBDIRS = elasticity
+
+include $(top_srcdir)/am/global-rules
diff --git a/dune/elasticity/Makefile.am b/dune/elasticity/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..a3dd77c6a83927482e9893e085ad9da4b2bc4529
--- /dev/null
+++ b/dune/elasticity/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS = 
+
+elasticitydir = $(includedir)/dune/elasticity
+elasticity_HEADERS = elasticityhelpers neohookeassembler.cc  neohookeassembler.hh  ogdenassembler.cc  ogdenassembler.hh  zienkiewiczzhuestimator.hh
+
+include $(top_srcdir)/am/global-rules
diff --git a/m4/dune-elasticity.m4 b/m4/dune-elasticity.m4
index 02d2b6999ddda8cf3c86f9e2daff85c8c3c3fc7c..8d4e0f28d76ca8f72c3d7ca05792701c02432adc 100644
--- a/m4/dune-elasticity.m4
+++ b/m4/dune-elasticity.m4
@@ -3,5 +3,5 @@ AC_DEFUN([DUNE_ELASTICITY_CHECKS],[
 ])
 
 AC_DEFUN([DUNE_ELASTICITY_CHECK_MODULE],[
-  DUNE_CHECK_MODULES([dune-elasticity], [dune-elasticity/elasticityhelpers.hh])
+  DUNE_CHECK_MODULES([dune-elasticity], [elasticity/elasticityhelpers.hh])
 ])