diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6aab0fb9..32adc33f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory( generators )
 add_subdirectory( tests )
 
 include(OkularConfigureChecks.cmake)
+include(MacroWriteBasicCMakeVersionFile)
 
 if(NOT WIN32)
  set(MATH_LIB m)
@@ -181,3 +182,10 @@ install(TARGETS okularpart DESTINATION ${PLUGIN_INSTALL_DIR})
 install( FILES okular_part.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 install( FILES part.rc DESTINATION ${DATA_INSTALL_DIR}/okular )
 
+########### cmake files #################
+
+macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/OkularConfigVersion.cmake 0 11 80)
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/OkularConfig.cmake
+              ${CMAKE_CURRENT_BINARY_DIR}/OkularConfigVersion.cmake
+        DESTINATION ${LIB_INSTALL_DIR}/cmake/Okular )
\ No newline at end of file
diff --git a/OkularConfig.cmake b/OkularConfig.cmake
new file mode 100644
index 000000000..d93cc468d
--- /dev/null
+++ b/OkularConfig.cmake
@@ -0,0 +1,17 @@
+# get from the full path to OkularConfig.cmake up to the base dir dir:
+get_filename_component( _okularBaseDir  ${CMAKE_CURRENT_LIST_FILE} PATH)
+get_filename_component( _okularBaseDir  ${_okularBaseDir} PATH)
+get_filename_component( _okularBaseDir  ${_okularBaseDir} PATH)
+get_filename_component( _okularBaseDir  ${_okularBaseDir} PATH)
+
+
+# find the full paths to the library and the includes:
+find_path(OKULAR_INCLUDE_DIR okular/core/document.h
+          HINTS ${_okularBaseDir}/include
+          NO_DEFAULT_PATH)
+
+find_library(OKULAR_CORE_LIBRARY okularcore 
+             HINTS ${_okularBaseDir}/lib
+             NO_DEFAULT_PATH)
+
+set(OKULAR_LIBRARIES ${OKULAR_CORE_LIBRARY})
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index 943f67975..c6cd60070 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -1,7 +1,6 @@
 # explicitely install the "public" cmake files
 
 set(cmakeFiles
-  FindOkular.cmake
   FindKSane.cmake
 )
 
diff --git a/cmake/modules/FindOkular.cmake b/cmake/modules/FindOkular.cmake
deleted file mode 100644
index 00a941f5b..000000000
--- a/cmake/modules/FindOkular.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-# - Find Okular
-# Find the Okular core library
-#
-# This module defines
-#  OKULAR_FOUND - whether the Okular core library was found
-#  OKULAR_LIBRARIES - the Okular core library
-#  OKULAR_INCLUDE_DIR - the include path of the Okular core library
-#
-
-if (OKULAR_INCLUDE_DIR AND OKULAR_LIBRARIES)
-
-  # Already in cache
-  set (OKULAR_FOUND TRUE)
-
-else (OKULAR_INCLUDE_DIR AND OKULAR_LIBRARIES)
-
-  find_library (OKULAR_LIBRARIES
-    NAMES
-    okularcore
-    PATHS
-    ${LIB_INSTALL_DIR}
-    ${KDE4_LIB_DIR}
-  )
-
-  find_path (OKULAR_INCLUDE_DIR
-    NAMES
-    okular/core/document.h
-    PATHS
-    ${INCLUDE_INSTALL_DIR}
-    ${KDE4_INCLUDE_DIR}
-  )
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(Okular DEFAULT_MSG OKULAR_LIBRARIES OKULAR_INCLUDE_DIR)
-
-endif (OKULAR_INCLUDE_DIR AND OKULAR_LIBRARIES)
-
-mark_as_advanced(OKULAR_INCLUDE_DIR OKULAR_LIBRARIES)