diff --git a/doc/handbook/0_dumux-handbook.tex b/doc/handbook/0_dumux-handbook.tex
index 9de687ab3a00ce3048354afd2c48ddd5507631ff..59d04dabe737d01037987ffa7b62fbc19e9fb41f 100644
--- a/doc/handbook/0_dumux-handbook.tex
+++ b/doc/handbook/0_dumux-handbook.tex
@@ -13,7 +13,6 @@
 \usepackage{graphicx}
 
 \usepackage{listings}
-\usepackage{makeidx}
 \usepackage[square,numbers]{natbib}
 \usepackage{pdflscape}
 \usepackage{rotating}
@@ -98,8 +97,6 @@ Universit\"at Stuttgart, Paffenwaldring 61, D-70569 Stuttgart, Germany}\\
 {\normalsize \texttt{\url{http://dumux.org}}}\\
 }
 
-\makeindex
-
 \begin{document}
 
 \maketitle
@@ -157,5 +154,4 @@ in deeper modifications of underlying \Dumux models, classes, functions, etc.
 
 \bibliographystyle{plainnat}
 \bibliography{dumux-handbook}
-\printindex
 \end{document}
diff --git a/doc/handbook/CMakeLists.txt b/doc/handbook/CMakeLists.txt
index be113ebe70a51ae744a032d62c907848723c62e6..5c880c781a7fb92b9c785f1eeadd2842bb803b4c 100644
--- a/doc/handbook/CMakeLists.txt
+++ b/doc/handbook/CMakeLists.txt
@@ -1,3 +1,12 @@
+if(${DUNE_COMMON_VERSION} VERSION_GREATER_EQUAL "2.7")
+# use latexmk
+dune_add_latex_document(
+  SOURCE 0_dumux-handbook.tex
+  FATHER_TARGET doc
+  INSTALL ${CMAKE_INSTALL_DOCDIR}/doc/handbook)
+
+else()
+# use UseLATEX.cmake
 set(TEX_INPUTS
   0_dumux-handbook.tex
   0_listingstyle.tex
@@ -40,3 +49,4 @@ dune_add_latex_document(0_dumux-handbook.tex
 
 create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf
   ${CMAKE_INSTALL_DOCDIR} 0_dumux-handbook)
+endif()