diff --git a/.gitignore b/.gitignore
index 9b4696c85..64b461df3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -350,4 +350,4 @@ Examples/**/pricingstats.csv
 *.fls
 
 .gitmodules
-
+CMakeUserPresets.json
diff --git a/ORE-SWIG/CMakeLists.txt b/ORE-SWIG/CMakeLists.txt
index 377c81000..f909fbcf4 100644
--- a/ORE-SWIG/CMakeLists.txt
+++ b/ORE-SWIG/CMakeLists.txt
@@ -32,7 +32,7 @@ get_library_name("QuantExt" QLE_LIB_NAME)
 set_ql_library_name()
 
 # To build the module, we moreover need Boost, Swig, Python
-set(BOOST_COMPONENT_LIST serialization date_time filesystem timer thread log)
+set(BOOST_COMPONENT_LIST serialization date_time filesystem timer thread log regex)
 
 
 if(ORE_USE_ZLIB)
diff --git a/OREData/CMakeLists.txt b/OREData/CMakeLists.txt
index acfb5aa80..5d866dea7 100644
--- a/OREData/CMakeLists.txt
+++ b/OREData/CMakeLists.txt
@@ -14,7 +14,7 @@ else()
     SET(COMPONENTS_CONDITIONAL "")
 endif()
 
-find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} date_time thread serialization timer log filesystem OPTIONAL_COMPONENTS system chrono)
+find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} date_time thread serialization timer log_setup log filesystem OPTIONAL_COMPONENTS system chrono)
 
 
 include_directories(${Boost_INCLUDE_DIRS})
diff --git a/QuantExt/CMakeLists.txt b/QuantExt/CMakeLists.txt
index 78253c3e1..e0bce3463 100644
--- a/QuantExt/CMakeLists.txt
+++ b/QuantExt/CMakeLists.txt
@@ -14,7 +14,7 @@ else()
 endif()
 
 
-find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} date_time thread serialization timer log filesystem OPTIONAL_COMPONENTS system chrono)
+find_package (Boost REQUIRED COMPONENTS ${COMPONENTS_CONDITIONAL} date_time thread serialization timer log_setup log filesystem OPTIONAL_COMPONENTS system chrono)
 
 
 if (ORE_ENABLE_PARALLEL_UNIT_TEST_RUNNER AND UNIX AND NOT APPLE)