diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4957d5882..ddc2c30a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -247,6 +247,9 @@ endif()
 macro_optional_find_package(Echonest 2.2.0)
 macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.2.0 is needed for dynamic playlists and the infosystem")
 
+find_package(Boost REQUIRED COMPONENTS system)
+macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explanation
+
 macro_optional_find_package(Lucene++ 3.0.0)
 macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection")
 
@@ -260,9 +263,6 @@ macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://develo
 include( CheckTagLibFileName )
 check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
 
-find_package(Boost REQUIRED)
-macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explanation
-
 macro_optional_find_package(Sparsehash)
 macro_log_feature(SPARSEHASH_FOUND "Sparsehash"
     "An extremely memory-efficient hash_map implementation."
diff --git a/CMakeModules/FindLucene++.cmake b/CMakeModules/FindLucene++.cmake
index 2a005df3e..12f37b4f7 100644
--- a/CMakeModules/FindLucene++.cmake
+++ b/CMakeModules/FindLucene++.cmake
@@ -54,7 +54,7 @@ IF (LUCENEPP_SHARED_LIBRARY)
 ENDIF (LUCENEPP_SHARED_LIBRARY)
 
 IF(LUCENEPP_CORE_LIBRARY AND LUCENEPP_SHARED_LIBRARY)
-  SET(LUCENEPP_LIBRARIES ${LUCENEPP_CORE_LIBRARY} ${LUCENEPP_SHARED_LIBRARY} boost_system)
+  SET(LUCENEPP_LIBRARIES ${LUCENEPP_CORE_LIBRARY} ${LUCENEPP_SHARED_LIBRARY} ${Boost_SYSTEM_LIBRARY})
 ENDIF(LUCENEPP_CORE_LIBRARY AND LUCENEPP_SHARED_LIBRARY)
 
 FIND_PATH(LUCENEPP_INCLUDE_DIR