diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt
index efa3d941..0229c112 100644
--- a/crlcore/CMakeLists.txt
+++ b/crlcore/CMakeLists.txt
@@ -13,21 +13,19 @@ ENDIF(COMMAND CMAKE_POLICY)
 MACRO(SETUP_PROJECT_PATHS project)
   IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
     MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
-    SET(${project}_DIR_SEARCH "$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(FIND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}" DIR_INDEX)
     IF( DIR_INDEX LESS 0)
-      LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}")
+      LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
     ENDIF( DIR_INDEX LESS 0)
   ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
   
   IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
     MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
-    LIST(APPEND ${project}_DIR_SEARCH     "$ENV{${project}_TOP}")
-    SET(PROJECT_MODULE_PATH               "$ENV{${project}_TOP}/share/cmake_modules/")
+    SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake_modules/")
     LIST(FIND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}" DIR_INDEX)
     IF( DIR_INDEX LESS 0)
-      LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}")
+      LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
     ENDIF( DIR_INDEX LESS 0)
   ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
 ENDMACRO(SETUP_PROJECT_PATHS project)
@@ -35,6 +33,11 @@ ENDMACRO(SETUP_PROJECT_PATHS project)
 SETUP_PROJECT_PATHS(IO)
 SETUP_PROJECT_PATHS(CORIOLIS)
 
+MESSAGE("-- Components of CMAKE_MODULE_PATH:")
+FOREACH(PATH IN LISTS CMAKE_MODULE_PATH)
+  MESSAGE("--   ${PATH}")
+ENDFOREACH(PATH)
+
 SET(QT_USE_QTXML    "true")
 #SET(QT_USE_QTOPENGL "true")
 
@@ -49,11 +52,6 @@ FIND_PACKAGE(HURRICANE REQUIRED)
 
 #LIST(INSERT CMAKE_MODULE_PATH 0 "${CRLCORE_SOURCE_DIR}/cmake_modules/")
 
-MESSAGE("-- Components of CMAKE_MODULE_PATH:")
-FOREACH(PATH IN LISTS CMAKE_MODULE_PATH)
-  MESSAGE("--   ${PATH}")
-ENDFOREACH(PATH)
-
 SET_LIB_LINK_MODE()
 
 ADD_SUBDIRECTORY(src)
diff --git a/crlcore/cmake_modules/FindCORIOLIS.cmake b/crlcore/cmake_modules/FindCORIOLIS.cmake
index d9c56a3a..781c68f5 100644
--- a/crlcore/cmake_modules/FindCORIOLIS.cmake
+++ b/crlcore/cmake_modules/FindCORIOLIS.cmake
@@ -10,6 +10,26 @@ SET(CORIOLIS_DIR_MESSAGE "Set the CORIOLIS_INCLUDE_DIR cmake cache entry to the
 
 # don't even bother under WIN32
 IF(UNIX)
+  # Setup the DIR_SEARCH_PATH.
+  MACRO(SETUP_SEARCH_DIR project)
+    IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
+      MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
+      LIST(FIND ${project}_DIR_SEARCH "${${project}_DIR_SEARCH}" DIR_INDEX)
+      IF( DIR_INDEX LESS 0)
+        LIST(INSERT ${project}_DIR_SEARCH 0 "$ENV{${project}_USER_TOP}")
+      ENDIF( DIR_INDEX LESS 0)
+    ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
+    
+    IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
+      MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
+      LIST(FIND ${project}_DIR_SEARCH "${${project}_DIR_SEARCH}" DIR_INDEX)
+      IF( DIR_INDEX LESS 0)
+        LIST(INSERT ${project}_DIR_SEARCH 0 "$ENV{${project}_TOP}")
+      ENDIF( DIR_INDEX LESS 0)
+    ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
+  ENDMACRO(SETUP_SEARCH_DIR project)
+  
+  SETUP_SEARCH_DIR(CORIOLIS)
   #
   # Look for an installation.
   #