diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt
index a64e8603..2bee3284 100644
--- a/crlcore/CMakeLists.txt
+++ b/crlcore/CMakeLists.txt
@@ -28,18 +28,33 @@ MACRO(SETUP_PROJECT_PATHS project)
   LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
 ENDMACRO(SETUP_PROJECT_PATHS project)
 
+SETUP_PROJECT_PATHS(GOODIES)
 SETUP_PROJECT_PATHS(VLSISAPD)
 SETUP_PROJECT_PATHS(CORIOLIS)
 
+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(QT_USE_QTXML    "true")
-#SET(QT_USE_QTOPENGL "true")
+STRING(REGEX MATCH "^/usr" IS_USR "$ENV{CORIOLIS_TOP}")
+STRING(REGEX MATCH "^/opt" IS_OPT "$ENV{CORIOLIS_TOP}")
+IF(IS_USR OR IS_OPT)
+  MESSAGE("-- Using system-wide /etc.")
+  SET(SYS_CONF_DIR "/etc" CACHE STRING "System configuration directory (/etc)" FORCE)
+ELSE(IS_USR OR IS_OPT)
+  MESSAGE("-- Using install tree /etc.")
+  SET(SYS_CONF_DIR "etc" CACHE STRING "System configuration directory (/etc)" FORCE)
+ENDIF(IS_USR OR IS_OPT)
 
-LIST(INSERT CMAKE_MODULE_PATH 0 "${CRLCORE_SOURCE_DIR}/cmake_modules/")
+SET(QT_USE_QTXML "true")
+
+FIND_PACKAGE(Goodies REQUIRED)
+
+set_lib_link_mode()
+SetupBoost(program_options filesystem python regex)
 
 FIND_PACKAGE(LibXml2 REQUIRED)
 FIND_PACKAGE(PythonLibs REQUIRED)
@@ -53,26 +68,6 @@ FIND_PACKAGE(VLSISAPD REQUIRED)
 FIND_PACKAGE(HURRICANE REQUIRED)
 INCLUDE(UseLATEX)
 
-SET_LIB_LINK_MODE()
-SET(Boost_USE_STATIC_LIBS ON)
-MESSAGE(STATUS "Always uses Boost static libraries.")
-FIND_PACKAGE(Boost 1.35.0 COMPONENTS program_options filesystem system regex python)
-IF(NOT Boost_FOUND)
-  FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem python regex REQUIRED)
-ENDIF(NOT Boost_FOUND)
-MESSAGE(STATUS "Found Boost libraries ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIR}")
-MESSAGE(STATUS "  ${Boost_LIBRARIES}")
-
-STRING(REGEX MATCH "^/usr" IS_USR "$ENV{CORIOLIS_TOP}")
-STRING(REGEX MATCH "^/opt" IS_OPT "$ENV{CORIOLIS_TOP}")
-IF(IS_USR OR IS_OPT)
-  MESSAGE("-- Using system-wide /etc.")
-  SET(SYS_CONF_DIR "/etc" CACHE STRING "System configuration directory (/etc)" FORCE)
-ELSE(IS_USR OR IS_OPT)
-  MESSAGE("-- Using install tree /etc.")
-  SET(SYS_CONF_DIR "etc" CACHE STRING "System configuration directory (/etc)" FORCE)
-ENDIF(IS_USR OR IS_OPT)
-
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(etc)
 ADD_SUBDIRECTORY(cmake_modules)