diff --git a/.gitignore b/.gitignore
index bee54bdfbdb0c731956921fdcd85e0085111f0b5..e90d8e0acada72b4979c1e4f2bebc1c27a6445d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,35 @@
+*.log
+*.o
+*.trs
+*~
+.deps/
+.libs/
+/aclocal.m4
+/am
+/autom4te.cache/
+/build-cmake/
+/compile
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.lt
+/config.status
+/config.sub
+/configure
+/configure.lineno
+/depcomp
+/dependencies.m4
+/dune-istl-*.tar.gz
+/dune-istl-?.?/
+/dune-istl.pc
+/install-sh
+/libtool
+/ltmain.sh
+/missing
+/mkinstalldirs
+/stamp-h1
+/test-driver
 Makefile
 Makefile.in
-config.guess
-config.h.in
-config.log
-config.status
-config.h
-config.lt
-config.sub
-configure
-dependencies.m4
-aclocal.m4
-autom4te.cache
-depcomp
-install-sh
-missing
-mkinstalldirs
-libtool
-dune-istl.pc
 semantic.cache
-configure.lineno
-stamp-h1
-dune-istl-*.tar.gz
-dune-istl-?.?
-ltmain.sh
-am
-.libs/
-.deps/
-*~
-*.o
-compile
-test-driver
-build-cmake/
diff --git a/cmake/.gitignore b/cmake/.gitignore
deleted file mode 100644
index 3dda72986fc5af262451a760393b3a7065938c80..0000000000000000000000000000000000000000
--- a/cmake/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/cmake/modules/.gitignore b/cmake/modules/.gitignore
deleted file mode 100644
index 3dda72986fc5af262451a760393b3a7065938c80..0000000000000000000000000000000000000000
--- a/cmake/modules/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/doc/.gitignore b/doc/.gitignore
index 809539a08ccbe88b54568a5912e62ab6e61f79b8..47d9caa897d5277e356d5ce1137cc1ec0021858f 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,16 +1,12 @@
-.deps
-Makefile
-Makefile.in
-semantic.cache
+*.aux
+*.bbl
+*.blg
+*.dvi
 *.html
+*.log
 *.out
 *.pdf
 *.ps
 *.toc
-*.aux
-*.bbl
-*.blg
-*.log
-*.dvi
-Makefile.dist.in
-Makefile.dist
+/Makefile.dist
+/Makefile.dist.in
diff --git a/dune/.gitignore b/dune/.gitignore
deleted file mode 100644
index 3dda72986fc5af262451a760393b3a7065938c80..0000000000000000000000000000000000000000
--- a/dune/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/dune/istl/.gitignore b/dune/istl/.gitignore
deleted file mode 100644
index 677993cc450715e48c301f6ac4c0e12a78a6120e..0000000000000000000000000000000000000000
--- a/dune/istl/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-semantic.cache
-istl.tar.gz
\ No newline at end of file
diff --git a/dune/istl/paamg/test/.gitignore b/dune/istl/paamg/test/.gitignore
index da05f6d0d9d7dabf0db4da3ae388028dd481ebea..7303f4b8410924eeedfdfe3af828d35ce4376d5b 100644
--- a/dune/istl/paamg/test/.gitignore
+++ b/dune/istl/paamg/test/.gitignore
@@ -1,20 +1,15 @@
-Makefile
-Makefile.in
-.deps
-.libs
-semantic.cache
-graphtest
-galerkintest
-hierarchytest
-amgtest
-pamgtest
-pamg_comm_repart_test
-pthreadamgtest
-pthreadfastamgtest
-pthreadtwoleveltest
-transfertest
-twolevelmethodschwarztest
-twolevelmethodtest
-kamgtest
-fastamg
+/amgtest
+/fastamg
+/galerkintest
+/graphtest
+/hierarchytest
+/kamgtest
+/pamg_comm_repart_test
+/pamgtest
+/pthreadamgtest
+/pthreadfastamgtest
+/pthreadtwoleveltest
+/transfertest
+/twolevelmethodschwarztest
+/twolevelmethodtest
 
diff --git a/dune/istl/test/.gitignore b/dune/istl/test/.gitignore
index b7bc76d0f3a1ebc6989cc210ecdc83a83256a45c..a22d7ed115940fd3f721dafb496f362a02704100 100644
--- a/dune/istl/test/.gitignore
+++ b/dune/istl/test/.gitignore
@@ -1,41 +1,34 @@
-Makefile
-Makefile.in
-.deps
-.libs
-semantic.cache
-complexrhstest
-dotproducttest
-bvectortest
-matrixutilstest
-vectorcommtest
-matrixtest
-matrixiteratortest
-overlappingschwarztest
-bcrsbuildtest
-superlctest
-superlustest
-superlutest
-superlztest
-mmtest
-mv
-iotest
-inverseoperator2prectest
-scaledidmatrixtest
-basearraytest
-vbvectortest
-matrixredisttest
-matrixmarkettest
-superluztest
-testmat
-testvec
-superluctest
-seqmatrixmarkettest
-solvertest
-umfpacktest
-umfpack_decomp
-*.log
-*.trs
-testmat_0.idx
-testmat_0.mm
-testvec_0.mm
-bcrsimplicitbuildtest
+/basearraytest
+/bcrsassigntest
+/bcrsbuildtest
+/bcrsimplicitbuildtest
+/bvectortest
+/complexmatrixtest
+/complexrhstest
+/dotproducttest
+/inverseoperator2prectest
+/iotest
+/matrixiteratortest
+/matrixmarkettest
+/matrixredisttest
+/matrixtest
+/matrixutilstest
+/mmtest
+/mv
+/overlappingschwarztest
+/scaledidmatrixtest
+/seqmatrixmarkettest
+/solvertest
+/superluctest
+/superlustest
+/superlutest
+/superluztest
+/testmat
+/testmat_0.idx
+/testmat_0.mm
+/testvec
+/testvec_0.mm
+/umfpack_decomp
+/umfpacktest
+/vbvectortest
+/vectorcommtest
diff --git a/lib/.gitignore b/lib/.gitignore
index 3dba4a72b5afecfac7475f19b0bf93cae34c2de0..4a5ba44046c9b7e1950e18d89a5a7ea3004be8db 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,4 +1 @@
-Makefile
-Makefile.in
-
-*.swp
+/*.swp
diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index d436efd0f78cbe225d620e34b12874af0518815e..0000000000000000000000000000000000000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile.in
-Makefile
-