Index: rttr-0.9.6/CMake/config.cmake
===================================================================
--- rttr-0.9.6.orig/CMake/config.cmake
+++ rttr-0.9.6/CMake/config.cmake
@@ -69,7 +69,7 @@ if(UNIX)
 
   set(RTTR_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
 
-  set(RTTR_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/rttr/cmake")
+  set(RTTR_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/rttr/")
   set(RTTR_ADDITIONAL_FILES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/rttr")
 
 elseif(WIN32)
Index: rttr-0.9.6/doc/CMakeLists.txt
===================================================================
--- rttr-0.9.6.orig/doc/CMakeLists.txt
+++ rttr-0.9.6/doc/CMakeLists.txt
@@ -33,12 +33,12 @@ set(DOXYGEN_PROJECT_NAME      "${PROJECT
 set(DOXYGEN_INPUT_DIRECTORY   "${CMAKE_SOURCE_DIR}/src/rttr \\
                                ${CMAKE_CURRENT_SOURCE_DIR}" )
 set(DOXYGEN_OUTPUT_DIRECTORY  "${CMAKE_BINARY_DIR}/doc")
-set(DOXYGEN_DOC_INSTALL_DIR   "doc")
+set(DOXYGEN_DOC_INSTALL_DIR   "${CMAKE_INSTALL_DATAROOTDIR}/doc/packages/rttr")
 set(DOXYGEN_CONFIG_FILE_IN    "DoxyFile.cfg.in")
 set(DOXYGEN_LAYOUT_FILE_IN    "doxygen-customization/layout/DoxygenLayout.xml.in")
 set(DOXYGEN_EXCLUDE           "")
 set(DOXYGEN_STRIP_FROM_PATH   "${CMAKE_SOURCE_DIR}/src/rttr")
-set(DOXYGEN_CUSTOM_HTML_DIR   "rttr-${RTTR_VERSION_MAJOR}-${RTTR_VERSION_MINOR}-${RTTR_VERSION_PATCH}")
+set(DOXYGEN_CUSTOM_HTML_DIR   "html")
 set(DOXYGEN_PREDEFINED        "DOXYGEN \\
                                RTTR_INLINE= \\
                                RTTR_FORCE_INLINE= \\