diff --git a/cmake/modules/DuneBoost.cmake b/cmake/modules/DuneBoost.cmake
index 636dda3260347275e6f06011899af362735ece9b..8e5bf97606410ef85382dfe10d3aaa569dbdec68 100644
--- a/cmake/modules/DuneBoost.cmake
+++ b/cmake/modules/DuneBoost.cmake
@@ -1,17 +1,27 @@
 # Searches for boost and provides the following function:
 #
-# add_dune_boost_flags(targets)
+# add_dune_boost_flags(targets [LINK_ALL_BOOST_LIBRARIES]
+#                      LIBRARIES lib1 lib2 ...)
 #
 # Adds boost compiler flags and libraries, and activates
-# Boost for the specified targets.
+# Boost for the specified targets. Libraries can either be
+# provided by listing them after the LIBRARIES keyword or one
+# can request linking with all available boost libraries by
+# passing the LINK_ALL_BOOST_LIBRARIES option to the function
+# call.
 find_package(Boost)
 set(HAVE_DUNE_BOOST ${Boost_FOUND})
 
 function(add_dune_boost_flags _targets)
+  cmake_parse_arguments(DUNE_BOOST LINK_ALL_BOOST_LIBRARIES "" LIBRARIES ${ARGN})
   if(Boost_FOUND)
     include_directories("${Boost_INCLUDE_DIRS}")
     foreach(_target ${_targets})
-      target_link_libraries(${_target} ${Boost_LIBRARIES})
+      if(DUNE_BOOST_LINK_ALL_BOOST_LIBRARIES)
+	target_link_libraries(${_target} "${DUNE_Boost_LIBRARIES}")
+      else(DUNE_BOOST_LINK_ALL_BOOST_LIBRARIES)
+	target_link_libraries(${_target} "${DUNE_BOOST_LIBRARIES}")
+      endif(DUNE_BOOST_LINK_ALL_BOOST_LIBRARIES)
       # The definitions are a hack as we do not seem to know which MPI implementation was
       # found.
       GET_TARGET_PROPERTY(_props ${_target} COMPILE_FLAGS)