diff --git a/include/cantera/base/fmt.h b/include/cantera/base/fmt.h
index 689c0c67e..a863f5069 100644
--- a/include/cantera/base/fmt.h
+++ b/include/cantera/base/fmt.h
@@ -12,9 +12,9 @@
 #define FMT_HEADER_ONLY
 
 //! Versions 6.2.0 and 6.2.1 of fmtlib do not include this define before they
-//! include windows.h, breaking builds on Windows. As of May 23, 2020 the fix
-//! is committed to the master branch of fmtlib but hasn't been released.
-#ifdef _WIN32
+//! include windows.h, breaking builds on Windows. Fixed in fmtlib 7.0.0 and
+//! newer. https://github.com/fmtlib/fmt/pull/1616
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif
 #if CT_USE_SYSTEM_FMT