diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9702feced..e269f3ba4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
       - #4322: Deprecated `UseLane`. Use the intersections array if you require lanes between steps
       - #4321: Fixes a potential crash in the MLD alternative code path when not even a shortest path can be found
 
+# 5.9.1
+    - Infrastructure
+      - STXXL is not required by default
+
 # 5.9.0
   - Changes from 5.8:
     - Algorithm:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c90fb773..d45f8f2b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ option(BUILD_PACKAGE "Build OSRM package" OFF)
 option(ENABLE_ASSERTIONS "Use assertions in release mode" OFF)
 option(ENABLE_COVERAGE "Build with coverage instrumentalisation" OFF)
 option(ENABLE_SANITIZER "Use memory sanitizer for Debug build" OFF)
-option(ENABLE_STXXL "Use STXXL library" ON)
+option(ENABLE_STXXL "Use STXXL library" OFF)
 option(ENABLE_LTO "Use LTO if available" OFF)
 option(ENABLE_FUZZING "Fuzz testing using LLVM's libFuzzer" OFF)
 option(ENABLE_GOLD_LINKER "Use GNU gold linker if available" ON)