diff --git a/katabatic/CMakeLists.txt b/katabatic/CMakeLists.txt
index 791734b1..0b84d215 100644
--- a/katabatic/CMakeLists.txt
+++ b/katabatic/CMakeLists.txt
@@ -51,6 +51,14 @@ FIND_PACKAGE(CORIOLIS REQUIRED)
 FIND_PACKAGE(KNIK 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/katabatic/src/CMakeLists.txt b/katabatic/src/CMakeLists.txt
index 4138d3cd..0a49b812 100644
--- a/katabatic/src/CMakeLists.txt
+++ b/katabatic/src/CMakeLists.txt
@@ -47,6 +47,21 @@ endif ( CHECK_DETERMINISM )
 
 
            add_library ( katabatic  ${cpps} ${mocCpps} )
+ target_link_libraries ( katabatic  ${KNIK_LIBRARIES}
+                                    ${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 katabatic DESTINATION lib${LIB_SUFFIX} )
                install ( FILES ${includes}
                                ${mocIncludes} DESTINATION include/coriolis2/katabatic )