diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f9c23275ef66af4db40b0a3b1f830801ee6b996..87272727695a840f2e3bf96c6f3a423b30b6283a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,10 @@ project("dune-istl" C CXX)
 # general stuff
 cmake_minimum_required(VERSION 2.8)
 
-# make sure our own modules are found
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
+#find dune-common and set the module path
+find_package(dune-common)
+list(APPEND CMAKE_MODULE_PATH ${dune-common_MODULE_PATH}
+  "${CMAKE_SOURCE_DIR}/cmake/modules")
 
 #include the dune macros
 include(DuneMacros)
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index c4bbf33a0eec9b3e600b347964ee824acd4b959f..e2a063cd6fe3978391a1d4234bb3116add8ae71b 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -1,3 +1,5 @@
-file(GLOB modules *.cmake)
+set(modules DuneIstlMacros.cmake
+  FindSuperLU.cmake)
+
 install(FILES ${modules} DESTINATION
-  ${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules)
+  ${DUNE_INSTALL_MODULEDIR})
diff --git a/cmake/pkg/dune-istl-config.cmake.in b/cmake/pkg/dune-istl-config.cmake.in
index 05a281054d8928b8a48b377a806a637effdf9f7d..03118d17554ae21c3f93827026f6bbc3298a5e2e 100644
--- a/cmake/pkg/dune-istl-config.cmake.in
+++ b/cmake/pkg/dune-istl-config.cmake.in
@@ -15,4 +15,5 @@ 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@_DEPENDS "@DUNE_DEPENDS@")
 set(@DUNE_MOD_NAME@_SUGGESTS "@DUNE_SUGGESTS@")
+set(@DUNE_MOD_NAME@_MODULE_PATH "@DUNE_INSTALL_MODULEDIR@")
 endif(NOT @DUNE_MOD_NAME@_FOUND)
\ No newline at end of file
diff --git a/dune-istl-config.cmake.in b/dune-istl-config.cmake.in
index 46a10c8000246f98141d6607c802bc093ddbd5de..a2ec4a44482ab7f4125b021c157bd5e1be076854 100644
--- a/dune-istl-config.cmake.in
+++ b/dune-istl-config.cmake.in
@@ -13,4 +13,5 @@ set(@DUNE_MOD_NAME@_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@")
 set(@DUNE_MOD_NAME@_LIBRARIES "")
 set(@DUNE_MOD_NAME@_DEPENDS "@DUNE_DEPENDS@")
 set(@DUNE_MOD_NAME@_SUGGESTS "@DUNE_SUGGESTS@")
+set(@DUNE_MOD_NAME@_MODULE_PATH "@CMAKE_SOURCE_DIR@/cmake/modules")
 endif(NOT @DUNE_MOD_NAME@_FOUND)
\ No newline at end of file