diff --git a/DuneIstlConfig.cmake.in b/DuneIstlConfig.cmake.in
index 2ee797b8feacf2a3d8336ac1453a2641a28c40ca..dced58abba3b2551e17d803edb67a2a6d8889a16 100644
--- a/DuneIstlConfig.cmake.in
+++ b/DuneIstlConfig.cmake.in
@@ -3,12 +3,12 @@ get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
 get_filename_component(_prefix "${_dir}/../.." ABSOLUTE)
 
 #import the target
-#include("${_prefix}/lib/cmake/@DUNE_MOD_NAME@-targets.cmake")
+#include("${_prefix}/lib/cmake/@DUNE_MOD_NAME_CMAKE@Targets.cmake")
 
 #report other information
-set(@DUNE_MOD_NAME@_INCLUDE_DIRS "${_prefix}/include")
-set(@DUNE_MOD_NAME@_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
-set(@DUNE_MOD_NAME@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
-set(@DUNE_MOD_NAME@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
-set(@DUNE_MOD_NAME@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
-set(@DUNE_MOD_NAME@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
+set(@DUNE_MOD_NAME_CMAKE@_INCLUDE_DIRS "${_prefix}/include")
+set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS "@CMAKE_CXX_FLAGS@")
+set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@")
+set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@")
+set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@")
+set(@DUNE_MOD_NAME_CMAKE@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 57b18a3682949a7d1f27c2b77a0a3c4ec8874c2f..beceeaf6395d00e99ae9097651a37b7756c643c8 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -3,6 +3,6 @@ add_subdirectory("comm")
 if(LATEX_USABLE)
   ADD_LATEX_DOCUMENT(istl.tex FATHER_TARGET doc
     BIB_FILES istl.bib  DEFAULT_SAFEPDF IMAGES blockstructure.eps)
-  create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/istl.pdf
-    share/doc/dune-istl/)
+  create_doc_install(istl.pdf
+    share/doc/dune-istl/ istl_safepdf)
 endif(LATEX_USABLE)
diff --git a/doc/comm/CMakeLists.txt b/doc/comm/CMakeLists.txt
index 537167d456b94ce3994641deec07284d40442fd8..afec0975aaed3359e884faf5fc489dac8e79c99e 100644
--- a/doc/comm/CMakeLists.txt
+++ b/doc/comm/CMakeLists.txt
@@ -9,5 +9,5 @@ if(LATEX_USABLE)
   ADD_LATEX_DOCUMENT(communication.tex FATHER_TARGET doc
     BIBFILES communication.bib DEFAULT_SAFEPDF INPUTS poosc08_test.cc
     IMAGE_DIRS figures)
-  create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/communication.pdf share/doc/dune-istl/comm)
+  create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/communication.pdf share/doc/dune-istl/comm communication_safepdf)
 endif(LATEX_USABLE)