diff --git a/nimbus/CMakeLists.txt b/nimbus/CMakeLists.txt
index a9e74e96..ede5b254 100644
--- a/nimbus/CMakeLists.txt
+++ b/nimbus/CMakeLists.txt
@@ -45,6 +45,14 @@ FIND_PACKAGE(HURRICANE REQUIRED)
 FIND_PACKAGE(CORIOLIS REQUIRED)
 
 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}")
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(cmake_modules)
diff --git a/nimbus/src/CMakeLists.txt b/nimbus/src/CMakeLists.txt
index 94639c3d..b0a319a3 100644
--- a/nimbus/src/CMakeLists.txt
+++ b/nimbus/src/CMakeLists.txt
@@ -37,6 +37,19 @@
       
 
            add_library ( nimbus ${cpps} )
+ target_link_libraries ( nimbus  ${HURRICANE_PYTHON_LIBRARIES}
+                                 ${HURRICANE_GRAPHICAL_LIBRARIES}
+                                 ${HURRICANE_LIBRARIES}
+                                 ${CONFIGURATION_LIBRARY}
+                                 ${CIF_LIBRARY}
+                                 ${AGDS_LIBRARY}
+                                 ${LEFDEF_LIBRARIES}
+                                 ${OA_LIBRARIES}
+                                 ${QT_LIBRARIES}
+                                 ${Boost_LIBRARIES}
+                                 ${LIBXML2_LIBRARIES}
+                                 ${PYTHON_LIBRARIES} -lutil
+                       )
                install ( TARGETS nimbus DESTINATION lib${LIB_SUFFIX} )
                install ( FILES   ${includes} DESTINATION include/coriolis2/nimbus )