diff --git a/CMakeLists.txt b/CMakeLists.txt
index eaf51b2d8..fed817a40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,11 +93,19 @@ endif ()
 set(ROOT_GRTEQ_24 ${ROOT_GRTEQ_24} CACHE INTERNAL "ROOT Version check")
 
 #--- check for boost ----------------------------------------------------------
-find_package(Boost REQUIRED
-  COMPONENTS
-    system
-    filesystem
-)
+find_package(Boost QUIET)
+if (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
+  find_package(Boost REQUIRED
+    COMPONENTS
+      filesystem
+  )
+else (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
+  find_package(Boost REQUIRED
+    COMPONENTS
+      system
+      filesystem
+  )
+endif (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
 message(STATUS "Boost libs: ${Boost_LIBRARIES}")
 
 #--- check for gsl ------------------------------------------------------------
diff --git a/src/external/Nonlocal/prog/CMakeLists.txt b/src/external/Nonlocal/prog/CMakeLists.txt
index f5213f075..1c36c0d05 100644
--- a/src/external/Nonlocal/prog/CMakeLists.txt
+++ b/src/external/Nonlocal/prog/CMakeLists.txt
@@ -22,11 +22,19 @@ if (ROOT_mathmore_FOUND)
 endif (ROOT_mathmore_FOUND)
 
 #--- check for boost ----------------------------------------------------------
-find_package(Boost REQUIRED
-  COMPONENTS
-    system
-    filesystem
-)
+find_package(Boost QUIET)
+if (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
+  find_package(Boost REQUIRED
+    COMPONENTS
+      filesystem
+  )
+else (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
+  find_package(Boost REQUIRED
+    COMPONENTS
+      system
+      filesystem
+  )
+endif (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
 message(STATUS "Boost libs: ${Boost_LIBRARIES}")
 
 #--- check for fftw3 ----------------------------------------------------------