diff --git a/vlsisapd/CMakeLists.txt b/vlsisapd/CMakeLists.txt
index fa1ba006..324e4857 100644
--- a/vlsisapd/CMakeLists.txt
+++ b/vlsisapd/CMakeLists.txt
@@ -2,24 +2,33 @@ PROJECT(VLSISAPD)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
 
+MACRO(SETUP_PROJECT_PATHS project)
+  IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
+    MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
+    SET(PROJECT_MODULE_PATH "${DESTDIR}$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 "${DESTDIR}$ENV{${project}_USER_TOP}/share/cmake/Modules/")
+    LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
+  ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
+
+  LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
+ENDMACRO(SETUP_PROJECT_PATHS project)
+
+SETUP_PROJECT_PATHS(GOODIES)
+
 LIST(INSERT CMAKE_MODULE_PATH 0 "${VLSISAPD_SOURCE_DIR}/cmake_modules")
 
-SET(CMAKE_C_FLAGS_DEBUG     "-g -Wall" CACHE STRING "Debug options." FORCE)
-SET(CMAKE_CXX_FLAGS_DEBUG   "-g -Wall" CACHE STRING "Debug options." FORCE)
-SET(CMAKE_C_FLAGS_RELEASE   "-O3 -DNDEBUG -Wall" CACHE STRING "Release options." FORCE)
-SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -Wall" CACHE STRING "Release options." FORCE)
+find_package(Goodies REQUIRED)
+
+SetupBoost(program_options filesystem python)
 
 FIND_PACKAGE(LibXml2 REQUIRED)
+FIND_PACKAGE(PythonLibs REQUIRED)
 FIND_PACKAGE(PythonSitePackages REQUIRED)
-
-SET(Boost_USE_STATIC_LIBS ON)
-MESSAGE(STATUS "Always uses Boost static libraries.")
-FIND_PACKAGE(Boost 1.35.0 COMPONENTS program_options filesystem python system)
-IF (NOT Boost_FOUND)
-  FIND_PACKAGE(Boost 1.32.0 COMPONENTS program_options filesystem python REQUIRED)
-ENDIF (NOT Boost_FOUND)
-
-MESSAGE(STATUS "Found Boost.Python ${Boost_LIB_VERSION} libraries in ${Boost_INCLUDE_DIR} as ${Boost_LIBRARIES}.")
 FIND_PACKAGE(PythonLibs REQUIRED)
 
 FIND_PACKAGE(Doxygen)
diff --git a/vlsisapd/cmake_modules/CMakeLists.txt b/vlsisapd/cmake_modules/CMakeLists.txt
index bb06a2fd..9a8e8cfb 100644
--- a/vlsisapd/cmake_modules/CMakeLists.txt
+++ b/vlsisapd/cmake_modules/CMakeLists.txt
@@ -1,2 +1 @@
-install(FILES FindVLSISAPD.cmake
-              FindPythonSitePackages.cmake DESTINATION share/cmake/Modules) 
+install(FILES FindVLSISAPD.cmake DESTINATION share/cmake/Modules) 
diff --git a/vlsisapd/cmake_modules/FindPythonSitePackages.cmake b/vlsisapd/cmake_modules/FindPythonSitePackages.cmake
deleted file mode 100644
index a5ceb1ee..00000000
--- a/vlsisapd/cmake_modules/FindPythonSitePackages.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-
-if ( UNIX )
-
-  execute_process(COMMAND echo "import os.path,distutils.sysconfig;pathes = distutils.sysconfig.get_python_lib().split('/');print os.path.join ( pathes[-2], pathes[-1] )"
-   		 OUTPUT_FILE /tmp/site.py)
-  execute_process ( COMMAND python /tmp/site.py
-                 OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE
-                 RESULT_VARIABLE RCODE)
-  execute_process ( COMMAND rm -f /tmp/site.py)
-
-  if ( RCODE EQUAL 0 )
-    set ( FindPythonSitePackages_FOUND TRUE )
-  else ( RCODE EQUAL 0 )
-    set ( FindPythonSitePackages_FOUND FALSE )
-  endif ( RCODE EQUAL 0 )
-
-  set ( PYTHON_SITE_PACKAGES "lib${LIB_SUFFIX}/${PYTHON_SITE_PACKAGES}"
-        CACHE STRING "Python site packages directory." FORCE )
-  mark_as_advanced ( PYTHON_SITE_PACKAGES )
-
-  if ( FindPythonSitePackages_FOUND )
-    if ( NOT FindPythonSitePackages_FIND_QUIETLY )
-      if ( FindPythonSitePackages_FOUND )
-        message ( STATUS "Found FindPythonSitePackages : ${PYTHON_SITE_PACKAGES}" )
-      endif ( FindPythonSitePackages_FOUND )
-    endif ( NOT FindPythonSitePackages_FIND_QUIETLY )
-  else ( FindPythonSitePackages_FOUND )
-   #if ( FindPythonSitePackages_FIND_REQUIRED )
-      message ( FATAL_ERROR "Python site packages directory was not found (pythonV.R/site-packages/)." )
-   #endif ( FindPythonSitePackages_FIND_REQUIRED )
-  endif ( FindPythonSitePackages_FOUND )
-
-endif ( UNIX )