diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index 5be2068082cb9f95ed87549ca860b4790f9a3134..3bf60c7fa89bfe230050aef82aea9f927bd9106b 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -526,7 +526,7 @@ macro(dune_project)
   if(NOT DUNE_INSTALL_MODULEDIR)
     set(DUNE_INSTALL_MODULEDIR ""
       CACHE PATH
-      "Installation directory for CMake modules. Default is \${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules when not set explicitely")
+      "Installation directory for CMake modules. Default is \${CMAKE_INSTALL_DATAROOTDIR}/dune/cmake/modules when not set explicitely")
     set(DUNE_INSTALL_MODULEDIR ${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules)
   endif(NOT DUNE_INSTALL_MODULEDIR)
 
@@ -600,7 +600,7 @@ macro(finalize_dune_project)
   include(CMakePackageConfigHelpers)
   include(GNUInstallDirs)
   set(DOXYSTYLE_DIR ${CMAKE_INSTALL_DATAROOTDIR}/dune-common/doc/doxygen/)
-  set(SCRIPT_DIR ${CMAKE_INSTALL_DATAROOTDIR}/cmake/scripts)
+  set(SCRIPT_DIR ${CMAKE_INSTALL_DATAROOTDIR}/dune/cmake/scripts)
 
   if(NOT EXISTS ${PROJECT_SOURCE_DIR}/cmake/pkg/${DUNE_MOD_NAME}-config.cmake.in)
     # Generate a standard cmake package configuration file
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
index 2d17132bf3c2f24b958ec8cc94d0195368a98835..d7b5b895f240133311d2cd4328cf54255b8c1b46 100644
--- a/cmake/modules/Makefile.am
+++ b/cmake/modules/Makefile.am
@@ -28,7 +28,7 @@ MODULES = \
   UseInkscape.cmake       \
   UseLATEX.cmake
 
-modulesdir = $(datadir)/cmake/modules
+modulesdir = $(datadir)/dune/cmake/modules
 dist_modules_DATA = ${MODULES}
 
 include $(top_srcdir)/am/global-rules
diff --git a/cmake/scripts/CMakeLists.txt b/cmake/scripts/CMakeLists.txt
index 166c957fc03e6a0ec4b76f5724b1b4869ea1042c..9c2a5c8c9d017b831b0844522fe3e57c90d170fc 100644
--- a/cmake/scripts/CMakeLists.txt
+++ b/cmake/scripts/CMakeLists.txt
@@ -6,4 +6,4 @@ set(modules
   RunDoxygen.cmake)
 
 install(FILES ${modules} ${CMAKE_CURRENT_SOURCE_DIR}/BuildTests.cmake.in
-  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/scripts)
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dune/cmake/scripts)
diff --git a/cmake/scripts/Makefile.am b/cmake/scripts/Makefile.am
index 21f4372c63193be2151df8d8129295760f4909d8..2128c4a907436739bca99d942ee6297538fe6c86 100644
--- a/cmake/scripts/Makefile.am
+++ b/cmake/scripts/Makefile.am
@@ -5,7 +5,7 @@ MODULES = BuildTests.cmake.in \
   InstallFile.cmake           \
   RunDoxygen.cmake
 
-modulesdir = $(datadir)/cmake/scripts
+modulesdir = $(datadir)/dune/cmake/scripts
 dist_modules_DATA = ${MODULES}
 
 include $(top_srcdir)/am/global-rules