diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99ec54b..cc58d70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ include(cmake/fetch_content.cmake)
 # in code coverage computation as they are test programs themselves.
 set(EXTRA_COVERAGE_EXCLUSION "\'${CMAKE_CURRENT_SOURCE_DIR}/integration/*\'")
 
-project(bofstd VERSION 5.8.1.6)
+project(bofstd VERSION 5.8.1.7)
 
 if (EMSCRIPTEN)
 message("Force pthread detection for BofStd compilation under EMSCRIPTEN")
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 29f2249..b4007d3 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -332,6 +332,7 @@ target_include_directories(bofstd
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/third/cpp-linenoise-master>
 	#$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/third/AsyncMulticastDelegate/include>
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/third/spdlog/include>
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/third/spdlog/fmt>
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/third/ixml/inc>
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/third/ixml/src/inc>
 #	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/third/vld/include>
diff --git a/lib/src/boflogsink_spdlog.h b/lib/src/boflogsink_spdlog.h
index 9c11106..99ee503 100644
--- a/lib/src/boflogsink_spdlog.h
+++ b/lib/src/boflogsink_spdlog.h
@@ -30,7 +30,7 @@
 #include <spdlog/sinks/null_sink.h>
 #include <spdlog/sinks/sink.h>
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 BEGIN_BOF_NAMESPACE()
 
 bool CheckIfLimitedSizeIsReached(spdlog::details::file_helper &_rFileHelper, uint32_t _LogLineSiwze_U32, uint32_t &_rCrtFileSizeInByte_U32, uint32_t _MaxLogSizeInByte_U32);
diff --git a/tests/src/main.cpp b/tests/src/main.cpp
index ec55fa1..cb38451 100644
--- a/tests/src/main.cpp
+++ b/tests/src/main.cpp
@@ -5,7 +5,7 @@
 
 #include "../include/gtestrunner.h"
 
-#include "fmt/format.h"
+#include <spdlog/fmt/bundled/format.h>
 #include <iostream>
 #if defined(_WIN32)
 // #define _CRTDBG_MAP_ALLOC
diff --git a/tests/src/ut_stringformatter.cpp b/tests/src/ut_stringformatter.cpp
index edd44cc..e89f62a 100644
--- a/tests/src/ut_stringformatter.cpp
+++ b/tests/src/ut_stringformatter.cpp
@@ -22,8 +22,7 @@
 #include <type_traits> // std::is_default_constructible
 // #include <xmemory>
 
-#include "fmt/os.h"
-
+#include <spdlog/fmt/bundled/os.h>
 // Captures file output by redirecting it to a pipe.
 // The output it can handle is limited by the pipe capacity.
 class output_redirect
diff --git a/vcpkg.json b/vcpkg.json
index 331a994..3e79d72 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "bofstd",
-  "version": "5.8.1.6",
+  "version": "5.8.1.7",
   "description": "The onbings general purpose C++ Multiplatform library",
   "dependencies": [
     {