diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt
index 0f3ae9d7..8ce23c1e 100644
--- a/unicorn/CMakeLists.txt
+++ b/unicorn/CMakeLists.txt
@@ -29,16 +29,32 @@ IF(COMMAND CMAKE_POLICY)
   CMAKE_POLICY(SET CMP0003 NEW)
 ENDIF(COMMAND CMAKE_POLICY)
 
-#IF("$ENV{HURRICANE_TOP}" STREQUAL "")
-#  MESSAGE("-- HURRICANE_TOP is *not* set")
-#ELSE("$ENV{HURRICANE_TOP}" STREQUAL "")
-#  MESSAGE("-- HURRICANE_TOP is set to $ENV{HURRICANE_TOP}")
-#  LIST(APPEND CMAKE_MODULE_PATH "$ENV{HURRICANE_TOP}/share/cmake_modules/")
-#  MESSAGE("${CMAKE_MODULE_PATH}")
-#ENDIF("$ENV{HURRICANE_TOP}" STREQUAL "")
-SET(CMAKE_MODULE_PATH "$ENV{HURRICANE_TOP}/share/cmake_modules/")
-
+# This macro has to be included in all the tools CMakeLists.txt as it's
+# the sole means of localizing other tools/projects.
+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/")
+    LIST(FIND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}" DIR_INDEX)
+    IF( DIR_INDEX LESS 0)
+      LIST(APPEND CMAKE_MODULE_PATH "${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/")
+    LIST(FIND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}" DIR_INDEX)
+    IF( DIR_INDEX LESS 0)
+      LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_MODULE_PATH}")
+    ENDIF( DIR_INDEX LESS 0)
+  ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
+ENDMACRO(SETUP_PROJECT_PATHS project)
 
+SETUP_PROJECT_PATHS(IO)
+SETUP_PROJECT_PATHS(CORIOLIS)
 
 SET(QT_USE_QTXML "true")
 
diff --git a/unicorn/cmake_modules/FindUNICORN.cmake b/unicorn/cmake_modules/FindUNICORN.cmake
index 6716e8d7..6b2ef206 100644
--- a/unicorn/cmake_modules/FindUNICORN.cmake
+++ b/unicorn/cmake_modules/FindUNICORN.cmake
@@ -12,14 +12,12 @@ SET(UNICORN_DIR_MESSAGE "Set the UNICORN_INCLUDE_DIR cmake cache entry to the ${
 
 # don't even bother under WIN32
 IF(UNIX)
-
-  SET(UNICORN_DIR_SEARCH $ENV{CORIOLIS_TOP} $ENV{HURRICANE_TOP})
   #
   # Look for an installation.
   #
   FIND_PATH(UNICORN_INCLUDE_PATH NAMES unicorn/UnicornEngine.h PATHS
     # Look in other places.
-    ${UNICORN_DIR_SEARCH}
+    ${CORIOLIS_DIR_SEARCH}
     PATH_SUFFIXES include/coriolis
     # Help the user find it if we cannot.
     DOC "The ${UNICORN_INCLUDE_PATH_DESCRIPTION}"
@@ -27,15 +25,7 @@ IF(UNIX)
 
   FIND_LIBRARY(UNICORN_LIBRARY_PATH
     NAMES unicorn
-    PATHS ${UNICORN_DIR_SEARCH}
-    PATH_SUFFIXES lib
-    # Help the user find it if we cannot.
-    DOC "The ${UNICORN_INCLUDE_PATH_DESCRIPTION}"
-  )
-
-  FIND_LIBRARY(UNICORN_STATIC_LIBRARY_PATH
-    NAMES unicorn-static
-    PATHS ${UNICORN_DIR_SEARCH}
+    PATHS ${CORIOLIS_DIR_SEARCH}
     PATH_SUFFIXES lib
     # Help the user find it if we cannot.
     DOC "The ${UNICORN_INCLUDE_PATH_DESCRIPTION}"