diff --git a/doc/istl/.gitignore b/doc/istl/.gitignore
index 55880268f2ad9f36919c5800c511bfd8ee056caa..97fdeb2148b15d9659527ce0aaeb77704ea26295 100644
--- a/doc/istl/.gitignore
+++ b/doc/istl/.gitignore
@@ -1,3 +1,16 @@
 Makefile
 Makefile.in
-semantic.cache
\ No newline at end of file
+semantic.cache
+.deps
+.libs
+*.aux
+*.bbl
+*.blg
+*.log
+*.out
+*.toc
+*.dvi
+*.pdf
+*.ps
+*.rel
+auto
\ No newline at end of file
diff --git a/doc/istl/Makefile.am b/doc/istl/Makefile.am
index 3c9fdda6a0c223024003de98fd7a9f9019078c2a..67fd066cb2eccfedfc82e558d35fdf690b2dbb13 100644
--- a/doc/istl/Makefile.am
+++ b/doc/istl/Makefile.am
@@ -1,3 +1,29 @@
 # $id: $
 
 SUBDIRS = comm
+
+dist_pkgdata_DATA = istl.pdf istl.ps
+
+
+# rerun TEX if log-file suggests that
+.tex.dvi:
+	$(TEX) $*
+	while grep Rerun $*.log > /dev/null ; do \
+	  $(TEX) $* ; \
+	done
+# check if Bibtex needs to be called
+	if grep '^\\citation{' *.aux > /dev/null ; then \
+	  $(BIBTEX) $* ; \
+	  $(TEX) $* ; \
+	  while grep Rerun $*.log > /dev/null ; do \
+	    $(TEX) $* ; \
+	  done ; \
+	fi
+
+.dvi.pdf:
+	$(DVIPDF) $*
+
+.dvi.ps:
+	$(DVIPS) $*
+
+CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.pdf *.ps
diff --git a/istl/doc/istl.bib b/doc/istl/istl.bib
similarity index 100%
rename from istl/doc/istl.bib
rename to doc/istl/istl.bib
diff --git a/istl/doc/istl.tex b/doc/istl/istl.tex
similarity index 100%
rename from istl/doc/istl.tex
rename to doc/istl/istl.tex
diff --git a/istl/doc/.gitignore b/istl/doc/.gitignore
deleted file mode 100644
index 3cc838d026a1cae6b8268b4742f17bbd0e84401c..0000000000000000000000000000000000000000
--- a/istl/doc/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.aux
-*.bbl
-*.blg
-*.log
-*.out
-*.toc
-*.dvi
-*.pdf
-*.ps
-Makefile
-Makefile.in
-semantic.cache
\ No newline at end of file
diff --git a/istl/doc/Makefile.am b/istl/doc/Makefile.am
deleted file mode 100644
index 69673c83c21d9fec2220ac2663e36383c26d1379..0000000000000000000000000000000000000000
--- a/istl/doc/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-dist_pkgdata_DATA = istl.pdf istl.ps
-
-SUFFIXES = .dvi .tex .pdf
-
-# rerun TEX if log-file suggests that
-.tex.dvi:
-	$(TEX) $*
-	while grep Rerun $*.log > /dev/null ; do \
-	  $(TEX) $* ; \
-	done
-# check if Bibtex needs to be called
-	if grep '^\\citation{' *.aux > /dev/null ; then \
-	  $(BIBTEX) $* ; \
-	  $(TEX) $* ; \
-	  while grep Rerun $*.log > /dev/null ; do \
-	    $(TEX) $* ; \
-	  done ; \
-	fi
-
-.dvi.pdf:
-	$(DVIPDF) $*
-
-.dvi.ps:
-	$(DVIPS) $*
-
-CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.pdf *.ps