diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3bf96fea75..3d5d5b4c83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -733,6 +733,14 @@ else()
     include_directories( SYSTEM ${GLEW_INCLUDE_DIR} )
 endif()
 
+
+
+    find_package( FMT REQUIRED )
+    check_find_package_result( FMT_FOUND "FMT" )
+    include_directories( SYSTEM ${FMT_INCLUDE_DIR} )
+
+
+
 #
 # Find GLM library, required
 #
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 67c5309d91..c7bb743812 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -30,7 +30,6 @@ add_subdirectory( clipper2 )
 add_subdirectory( compoundfilereader )
 add_subdirectory( delaunator )
 add_subdirectory( dxflib_qcad )
-add_subdirectory( fmt )
 add_subdirectory( gzip-hpp )
 add_subdirectory( lemon )
 add_subdirectory( libcontext )
--- kicad-9999/pagelayout_editor/tools/pl_point_editor.cpp.old	2023-07-21 18:29:39.731262203 -0500
+++ kicad-9999/pagelayout_editor/tools/pl_point_editor.cpp	2023-07-21 18:30:10.128712742 -0500
@@ -197,7 +197,7 @@
                 {
                     m_frame->SaveCopyInUndoList();
                 }
-                catch( const fmt::v10::format_error& exc )
+                catch( const fmt::v9::format_error& exc )
                 {
                     wxLogWarning( wxS( "Exception \"%s\" serializing string ocurred." ),
                                   exc.what() );
--- kicad-9999/pagelayout_editor/tools/pl_edit_tool.cpp.old	2023-07-21 18:29:28.267633222 -0500
+++ kicad-9999/pagelayout_editor/tools/pl_edit_tool.cpp	2023-07-21 18:30:02.611852224 -0500
@@ -139,7 +139,7 @@
         {
             m_frame->SaveCopyInUndoList();
         }
-        catch( const fmt::v10::format_error& exc )
+        catch( const fmt::v9::format_error& exc )
         {
             wxLogWarning( wxS( "Exception \"%s\" serializing string ocurred." ),
                           exc.what() );