diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt
index 01779980..19aa1453 100644
--- a/unicorn/CMakeLists.txt
+++ b/unicorn/CMakeLists.txt
@@ -34,13 +34,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/unicorn/cmake_modules/CMakeLists.txt b/unicorn/cmake_modules/CMakeLists.txt
index 70512c10..281355b7 100644
--- a/unicorn/cmake_modules/CMakeLists.txt
+++ b/unicorn/cmake_modules/CMakeLists.txt
@@ -1 +1 @@
-install ( FILES FindUNICORN.cmake DESTINATION share/cmake_modules ) 
+install ( FILES FindUNICORN.cmake DESTINATION share/cmake/Modules ) 
diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt
index 6d0d1b58..e50bb60e 100644
--- a/unicorn/src/CMakeLists.txt
+++ b/unicorn/src/CMakeLists.txt
@@ -61,5 +61,5 @@
                install ( TARGETS       unicorn DESTINATION lib${LIB_SUFFIX} )
                install ( TARGETS       cgt     DESTINATION bin )
                install ( FILES         ${includes}
-                                       ${mocIncludes} DESTINATION include/coriolis/unicorn ) 
+                                       ${mocIncludes} DESTINATION include/coriolis2/unicorn )