diff --git a/solstice/CMakeLists.txt b/solstice/CMakeLists.txt
index 11d2522c..862eb6d7 100644
--- a/solstice/CMakeLists.txt
+++ b/solstice/CMakeLists.txt
@@ -10,13 +10,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/solstice/cmake_modules/CMakeLists.txt b/solstice/cmake_modules/CMakeLists.txt
index 2039727c..52981daf 100644
--- a/solstice/cmake_modules/CMakeLists.txt
+++ b/solstice/cmake_modules/CMakeLists.txt
@@ -1 +1 @@
-install ( FILES FindSOLSTICE.cmake DESTINATION share/cmake_modules )
+install ( FILES FindSOLSTICE.cmake DESTINATION share/cmake/Modules )
diff --git a/solstice/src/CMakeLists.txt b/solstice/src/CMakeLists.txt
index 8581e135..f08b4f63 100644
--- a/solstice/src/CMakeLists.txt
+++ b/solstice/src/CMakeLists.txt
@@ -47,6 +47,6 @@
                        )
                install ( TARGETS        solstice DESTINATION lib${LIB_SUFFIX} )
                install ( FILES          ${includes}
-                                        ${mocIncludes} DESTINATION include/coriolis/solstice ) 
+                                        ${mocIncludes} DESTINATION include/coriolis2/solstice )