diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5e56fc094ead12d6b9808133e5ec37e47f012a78..adb9d348e0d343c0a33c6e83545de639e4a94d66 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,7 +20,8 @@ EXTRAINSTALL=example.opts
 
 # install the html pages
 docdir=$(datadir)/doc/dune-common
-doc_DATA = $(PAGES) example.opts
+DOCFILES = $(PAGES)
+DOCFILES_EXTRA = example.opts
 
 EXTRA_DIST = $(PAGES) example.opts
 
diff --git a/doc/buildsystem/Makefile.am b/doc/buildsystem/Makefile.am
index b4838eca0d94deb6b4e40d2ec9bad71354e9fa56..22dbb30b9af3b1ce9df3ff37281c4e9fc2b42e93 100644
--- a/doc/buildsystem/Makefile.am
+++ b/doc/buildsystem/Makefile.am
@@ -1,34 +1,17 @@
 # $Id: Makefile.am 4499 2006-04-13 14:56:35Z christi $
 
-if BUILD_DOCS
-  DOCS=buildsystem.pdf buildsystem.ps
-endif
-
 # setting like in dune-web
 CURDIR=doc/buildsystem
-# position of the web base directory,
-# relative to $(CURDIR)
-BASEDIR=..
-EXTRAINSTALL = buildsystem.pdf
-
-EXTRA_DIST = $(DOCS)
+BASEDIR=../..
 
 # install the html pages
-buildsystemdir=$(datadir)/doc/dune-common/buildsystem
-buildsystem_DATA = $(DOCS)
+docdir=$(datadir)/doc/dune-common/buildsystem
+if BUILD_DOCS
+  DOCFILES=buildsystem.pdf
+  EXTRA_DIST=buildsystem.pdf
+endif
 
-# include rules for wml -> html transformation
+# include predefined rules
 include $(top_srcdir)/am/webstuff
-
 include $(top_srcdir)/am/latex
-
-# remove html pages on ``make  clean''
-CLEANFILES = auto *.aux *.dvi *.log *.out *.toc
-
-# PDFs and PSs are only clean in svn version not in the tarballs
-SVNCLEANFILES = *.pdf *.ps
-clean-local:
-	if test -e $(top_srcdir)/$(CURDIR)/doxygen/Doxydep; then rm -rf $(SVNCLEANFILES) ; fi
-
-# include further rules needed by Dune
 include $(top_srcdir)/am/global-rules
diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am
index 06279a6a06614d33b26ad0875abbee8cceb7113b..6e7a341444c13347e1650d42dec7c7531fb320bc 100644
--- a/doc/devel/Makefile.am
+++ b/doc/devel/Makefile.am
@@ -15,15 +15,9 @@ CURDIR=doc/devel
 # install the html pages
 develdir=$(datadir)/doc/dune-common/devel
 if BUILD_DOCS
-devel_DATA = $(PAGES)
-EXTRA_DIST= $(PAGES)
+DOCFILES = $(PAGES)
+EXTRA_DIST = $(PAGES)
 endif
 
 include $(top_srcdir)/am/webstuff
-
-# remove html pages on ``make  clean'' if we are not a tarball
-SVNCLEANFILES = $(PAGES)
-clean-local:
-	if test -e $(top_srcdir)/doc/doxygen/Doxydep; then rm -rf $(SVNCLEANFILES); fi
-
 include $(top_srcdir)/am/global-rules
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index b53426fd7d43d47ba75af88a798ab969090a9bf2..fb09aeee1a84718b1d14afc120e2bebde8832b43 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -12,11 +12,8 @@ endif
 endif
 
 # add some more stuff to install and tarball
-doxygen_DATA = $(PAGES)
+DOCFILES = $(PAGES)
 EXTRA_DIST = $(PAGES)
 
 include $(top_srcdir)/am/doxygen
 include $(top_srcdir)/am/global-rules
-
-foo:
-	echo $(PAGES)