diff --git a/kite/CMakeLists.txt b/kite/CMakeLists.txt
index 46bd4098..26fe2f7e 100644
--- a/kite/CMakeLists.txt
+++ b/kite/CMakeLists.txt
@@ -56,7 +56,14 @@ FIND_PACKAGE(KNIK REQUIRED)
 FIND_PACKAGE(KATABATIC REQUIRED)
 
 SET_LIB_LINK_MODE()
-FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem REQUIRED)
+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}")
 
 IF(CHECK_DATABASE)
   ADD_DEFINITIONS(-DCHECK_DATABASE)
diff --git a/kite/src/CMakeLists.txt b/kite/src/CMakeLists.txt
index ee69a592..ebedf09a 100644
--- a/kite/src/CMakeLists.txt
+++ b/kite/src/CMakeLists.txt
@@ -66,29 +66,30 @@
           qt4_wrap_cpp ( mocCpps       ${mocIncludes} )
 
 
-           add_library ( kite             ${cpps} ${mocCpps} )
-        add_executable ( kite-text        ${kitecpps} )
- target_link_libraries ( kite-text        kite
-                                          ${KATABATIC_LIBRARIES}
-                                          ${KNIK_LIBRARIES}
-                                          ${CORIOLIS_LIBRARIES}
-                                          ${HURRICANE_GRAPHICAL_LIBRARIES}
-                                          ${HURRICANE_PYTHON_LIBRARIES}
-                                          ${HURRICANE_LIBRARIES}
-                                          ${CIF_LIBRARY}
-                                          ${AGDS_LIBRARY}
-                                          ${CONFIGURATION_LIBRARY}
-                                          ${QT_LIBRARIES}
-                                          ${LEFDEF_LIBRARIES}
-                                          ${OA_LIBRARIES}
-                                          ${Boost_LIBRARIES}
-                                          ${PYTHON_LIBRARIES}
-                                          -lutil
-                                          ${LIBXML2_LIBRARIES}
+           add_library ( kite          ${cpps} ${mocCpps} )
+ target_link_libraries ( kite          ${KATABATIC_LIBRARIES}
+                                       ${KNIK_LIBRARIES}
+                                       ${NIMBUS_LIBRARIES}
+                                       ${CORIOLIS_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          kite      DESTINATION lib${LIB_SUFFIX} )
-               install ( TARGETS          kite-text DESTINATION bin )
 
-               install ( FILES       ${includes}
-                                     ${mocIncludes} DESTINATION include/coriolis2/kite ) 
+        add_executable ( kite-text     ${kitecpps} )
+ target_link_libraries ( kite-text     kite )
+               install ( TARGETS       kite      DESTINATION lib${LIB_SUFFIX} )
+               install ( TARGETS       kite-text DESTINATION bin )
+
+               install ( FILES         ${includes}
+                                       ${mocIncludes} DESTINATION include/coriolis2/kite )