diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b8db538a..073f06088 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1010,7 +1010,7 @@ if(Boost_VERSION_STRING VERSION_LESS 1.70.0)
     )
 endif()
 
-# Fox for CentOS 7 with cmake3 and gcc8
+# Fix for CentOS 7 with cmake3 and gcc8
 if(Boost_VERSION_STRING VERSION_LESS "1.60")
     set(USE_GENERIC_LAMBDAS OFF)
 endif()
@@ -1020,6 +1020,11 @@ if(Boost_VERSION_STRING VERSION_GREATER 1.72.99)
     set(USE_BOOST_BIND_PLACEHOLDERS ON)
 endif()
 
+# Fix for Boost >= 1.89 - Boost::system becomes header-only
+if(Boost_VERSION_STRING VERSION_GREATER 1.88.99)
+    add_library(Boost::system ALIAS Boost::headers)
+endif()
+
 
 
 ################################################################################
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 295f753aa..3a886b653 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -41,6 +41,7 @@ All notable changes to GNSS-SDR will be documented in this file.
 - Updated `gsl-lite` to v1.0.1. See the
   [gsl-lite release](https://github.com/gsl-lite/gsl-lite/releases/tag/v1.0.1).
 - Updated local `cpu_features` library to v0.10.1.
+- Allow linking against Boost 1.89.0.
 
 ### Improvements in Usability: