diff --git a/.cirrus.yml b/.cirrus.yml
index 98047298e..117aadf78 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,7 +4,7 @@ task:
     image_family: freebsd-12-2
 
   prepare_script:
-    - pkg install -yq git cmake jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap
+    - pkg install -yq git cmake jpeg-turbo mysql80-client ffmpeg libvncserver libjwt libfmt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap
 
   configure_script:
     - git submodule update --init --recursive
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index aed08288d..1efdaf96b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -54,7 +54,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install libx264-dev libmp4v2-dev libavdevice-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
         sudo apt-get install libbz2-dev libgcrypt20-dev libcurl4-gnutls-dev libjpeg-turbo8-dev libturbojpeg0-dev
-        sudo apt-get install default-libmysqlclient-dev libpcre3-dev libpolkit-gobject-1-dev libv4l-dev libvlc-dev
+        sudo apt-get install default-libmysqlclient-dev libpcre3-dev libpolkit-gobject-1-dev libv4l-dev libvlc-dev libfmt-dev
         sudo apt-get install libdate-manip-perl libdbd-mysql-perl libphp-serialization-perl libsys-mmap-perl
         sudo apt-get install libwww-perl libdata-uuid-perl libssl-dev libcrypt-eksblowfish-perl libdata-entropy-perl
         
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9acaedc9b..c3fc4ae8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -644,6 +644,8 @@ else()
   set(HAVE_RTSP_SERVER 0)
 endif()
 
+find_package(fmt REQUIRED)
+
 #
 # *** END OF LIBRARY CHECKS ***
 
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index b0b3c1abe..86b72b74f 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -83,6 +83,7 @@ BuildRequires: libv4l-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gzip
 BuildRequires: zlib-devel
+BuildRequires: fmt-devel
 
 # ZoneMinder looks for and records the location of the ffmpeg binary during build
 BuildRequires: ffmpeg
@@ -131,6 +132,7 @@ Requires: perl(Net::FTP)
 Requires: perl(LWP::Protocol::https)
 Requires: ca-certificates
 Requires: zip
+Requires: fmt
 %{?systemd_requires}
 
 Requires(post): %{_bindir}/gpasswd
diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control
index 28c9374a1..e02ff0e14 100644
--- a/distros/ubuntu2004/control
+++ b/distros/ubuntu2004/control
@@ -32,6 +32,7 @@ Build-Depends: debhelper (>= 12), sphinx-doc, python3-sphinx, dh-linktree, dh-ap
               ,libcrypt-eksblowfish-perl
               ,libdata-entropy-perl
               ,libvncserver-dev
+              ,libfmt-dev
 Standards-Version: 4.5.0
 Homepage: https://www.zoneminder.com/
 
@@ -74,6 +75,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libcrypt-eksblowfish-perl
         ,libdata-entropy-perl
         ,libvncclient1|libvncclient0
+        ,libfmt
 Recommends: ${misc:Recommends}
            ,libapache2-mod-php | php-fpm
            ,default-mysql-server | mariadb-server | virtual-mysql-server