diff --git a/devel/libfmt/Makefile b/devel/libfmt/Makefile
index 7779ac4fd018..ee1293339357 100644
--- a/devel/libfmt/Makefile
+++ b/devel/libfmt/Makefile
@@ -1,38 +1,40 @@
 PORTNAME=	fmt
 # Make sure to check devel/spdlog consumers too
-PORTVERSION=	8.1.1
+PORTVERSION=	9.1.0
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/fmtlib/fmt/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	lib
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Formatting library for C++
 WWW=		https://fmt.dev/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-USES=		cmake compiler:c++11-lang cpe zip
+USES=		cmake compiler:c++11-lang cpe
 
-CMAKE_OFF=	FMT_CUDA_TEST FMT_DOC FMT_FUZZ FMT_MODULE FMT_PEDANTIC FMT_SYSTEM_HEADERS FMT_TEST FMT_WERROR
+USE_GITHUB=	yes
+GH_ACCOUNT=	fmtlib
+
+CMAKE_OFF=	FMT_DOC FMT_FUZZ FMT_MODULE FMT_PEDANTIC FMT_SYSTEM_HEADERS FMT_TEST FMT_WERROR
 CMAKE_ON=	BUILD_SHARED_LIBS FMT_OS
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 # include/fmt/*
 CONFLICTS_INSTALL=	axom
 
 OPTIONS_DEFINE=	FULL_CACHE_DRAGONBOX
 OPTIONS_DEFAULT=FULL_CACHE_DRAGONBOX
 FULL_CACHE_DRAGONBOX_DESC=	Use larger binary size for better performance
 
 FULL_CACHE_DRAGONBOX_CXXFLAGS=	-DFMT_USE_FULL_CACHE_DRAGONBOX=1
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFMT_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/devel/libfmt/distinfo b/devel/libfmt/distinfo
index d884e19830a8..10656e04f033 100644
--- a/devel/libfmt/distinfo
+++ b/devel/libfmt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643382500
-SHA256 (fmt-8.1.1.zip) = 23778bad8edba12d76e4075da06db591f3b0e3c6c04928ced4a7282ca3400e5d
-SIZE (fmt-8.1.1.zip) = 1248058
+TIMESTAMP = 1669806716
+SHA256 (fmtlib-fmt-9.1.0_GH0.tar.gz) = 5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+SIZE (fmtlib-fmt-9.1.0_GH0.tar.gz) = 837901
diff --git a/devel/libfmt/pkg-plist b/devel/libfmt/pkg-plist
index 8ece4bdf49b5..96ddb7fa95f7 100644
--- a/devel/libfmt/pkg-plist
+++ b/devel/libfmt/pkg-plist
@@ -1,21 +1,21 @@
 include/fmt/args.h
 include/fmt/chrono.h
 include/fmt/color.h
 include/fmt/compile.h
 include/fmt/core.h
 include/fmt/format-inl.h
 include/fmt/format.h
-include/fmt/locale.h
 include/fmt/os.h
 include/fmt/ostream.h
 include/fmt/printf.h
 include/fmt/ranges.h
+include/fmt/std.h
 include/fmt/xchar.h
 lib/cmake/fmt/fmt-config-version.cmake
 lib/cmake/fmt/fmt-config.cmake
 lib/cmake/fmt/fmt-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/fmt/fmt-targets.cmake
 lib/libfmt.so
-lib/libfmt.so.8
+lib/libfmt.so.9
 lib/libfmt.so.%%PORTVERSION%%
 libdata/pkgconfig/fmt.pc