diff --git a/Makefile.am b/Makefile.am
index af8f434a84ac59c74035d80dda668fdfdd40d9b8..14e5c32f8ae677b2584460309445b28477be7ba1 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 = m4 dune test
+SUBDIRS = doc m4 dune test
 
 # possible options
 LDADD = $(IPOPT_LDFLAGS) $(IPOPT_LIBS)
diff --git a/configure.ac b/configure.ac
index 42fabec0882d82d67973ab650de0c59523720b34..06a29c72eb70ba4a825c5c2f9d27aa401528d02b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,9 @@ AC_SUBST(AM_LDFLAGS, $DUNE_LDFLAGS)
 LIBS="$DUNE_LIBS"
 
 AC_CONFIG_FILES([Makefile
+                 doc/Makefile
+                 doc/doxygen/Makefile
+                 doc/doxygen/Doxyfile
                  dune/Makefile
                  dune/gfe/Makefile
                  test/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..8606374f90e1013901a46fd8aaa9bd15801cdb36
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,10 @@
+
+SUBDIRS = doxygen
+CURDIR = doc
+BASEDIR = ..
+
+# where to install the documentation too
+docdir=$(datadir)/doc/dune-gfe
+
+include $(top_srcdir)/am/webstuff
+include $(top_srcdir)/am/global-rules
diff --git a/doc/doxygen/Doxylocal b/doc/doxygen/Doxylocal
new file mode 100644
index 0000000000000000000000000000000000000000..76a97b534ec4192ed3f41380b44e9b903c3c5e40
--- /dev/null
+++ b/doc/doxygen/Doxylocal
@@ -0,0 +1,6 @@
+INPUT                  += @top_srcdir@/dune/gfe
+EXCLUDE                += 
+EXAMPLE_PATH           +=
+EXAMPLE_PATTERNS       +=
+IMAGE_PATH             +=
+PREDEFINED             += DOXYGEN 
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..d94c751b4a1ba391b553822f67bcb7ea32621f90
--- /dev/null
+++ b/doc/doxygen/Makefile.am
@@ -0,0 +1,7 @@
+
+BASEDIR=../..
+CURDIR=doc/doxygen
+
+include $(top_srcdir)/am/doxygen
+include $(top_srcdir)/am/global-rules
+