diff --git a/katabatic/CMakeLists.txt b/katabatic/CMakeLists.txt
index c334da6c..98884506 100644
--- a/katabatic/CMakeLists.txt
+++ b/katabatic/CMakeLists.txt
@@ -23,13 +23,13 @@ ENDIF(COMMAND CMAKE_POLICY)
 MACRO(SETUP_PROJECT_PATHS project)
   IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
     MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
-    SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake_modules/")
+    SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake/Modules/")
     LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
   ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
 
   IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
     MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
-    SET(PROJECT_MODULE_PATH   "$ENV{${project}_USER_TOP}/share/cmake_modules/")
+    SET(PROJECT_MODULE_PATH   "$ENV{${project}_USER_TOP}/share/cmake/Modules/")
     LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
   ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
 
diff --git a/katabatic/cmake_modules/CMakeLists.txt b/katabatic/cmake_modules/CMakeLists.txt
index c8ad6407..c553b595 100644
--- a/katabatic/cmake_modules/CMakeLists.txt
+++ b/katabatic/cmake_modules/CMakeLists.txt
@@ -1 +1 @@
-install ( FILES FindKATABATIC.cmake DESTINATION share/cmake_modules ) 
+install ( FILES FindKATABATIC.cmake DESTINATION share/cmake/Modules ) 
diff --git a/katabatic/doc/CMakeLists.txt b/katabatic/doc/CMakeLists.txt
index 5bb863ab..f7b78082 100644
--- a/katabatic/doc/CMakeLists.txt
+++ b/katabatic/doc/CMakeLists.txt
@@ -1,6 +1,6 @@
 
-               set ( htmlInstallDir  share/doc/en/html/katabatic )
-               set ( latexInstallDir share/doc/en/latex/katabatic )
+               set ( htmlInstallDir  share/doc/coriolis2/en/html/katabatic )
+               set ( latexInstallDir share/doc/coriolis2/en/latex/katabatic )
 
  add_custom_target ( doc ALL cd ${KATABATIC_SOURCE_DIR}/doc && ${DOXYGEN_EXECUTABLE} doxyfile )
 
diff --git a/katabatic/src/CMakeLists.txt b/katabatic/src/CMakeLists.txt
index ab959c21..3de48088 100644
--- a/katabatic/src/CMakeLists.txt
+++ b/katabatic/src/CMakeLists.txt
@@ -56,5 +56,5 @@ endif ( CHECK_DETERMINISM )
                        )
                install ( TARGETS katabatic DESTINATION lib${LIB_SUFFIX} )
                install ( FILES ${includes}
-                               ${mocIncludes} DESTINATION include/coriolis/katabatic ) 
+                               ${mocIncludes} DESTINATION include/coriolis2/katabatic )