diff --git a/x11-fonts/font-awesome/Makefile b/x11-fonts/font-awesome/Makefile
index 28774f0d23a7..004deb6188d3 100644
--- a/x11-fonts/font-awesome/Makefile
+++ b/x11-fonts/font-awesome/Makefile
@@ -1,28 +1,32 @@
 PORTNAME=	font-awesome
-DISTVERSION=	6.2.1
+DISTVERSION=	7.0.1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://use.fontawesome.com/releases/v${DISTVERSION}/
+MASTER_SITES=	https://use.fontawesome.com/releases/v${DISTVERSION}/ \
+		https://github.com/FortAwesome/Font-Awesome/releases/download/${DISTVERSION}/
 DISTNAME=	fontawesome-free-${DISTVERSION}-desktop
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Suite of pictographic icons from Font Awesome (free version)
-WWW=		https://fontawesome.com/
+WWW=		https://fontawesome.com/ \
+		https://github.com/FortAwesome/Font-Awesome/
 
 LICENSE=	OFL11
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		fonts zip
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-PORTSCOUT=	site:https://github.com/FortAwesome/Font-Awesome/releases
 
-PLIST_FILES=	${FONTSDIR}/Font\ Awesome\ 6\ Brands-Regular-400.otf \
-		${FONTSDIR}/Font\ Awesome\ 6\ Free-Regular-400.otf \
-		${FONTSDIR}/Font\ Awesome\ 6\ Free-Solid-900.otf
+VER=		${DISTVERSION:R:R}
+SUB_FILES=	pkg-message
+SUB_LIST=	VER=${VER}
+PLIST_FILES=	${FONTSDIR}/Font\ Awesome\ ${VER}\ Brands-Regular-400.otf \
+		${FONTSDIR}/Font\ Awesome\ ${VER}\ Free-Regular-400.otf \
+		${FONTSDIR}/Font\ Awesome\ ${VER}\ Free-Solid-900.otf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/otfs/*.otf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/font-awesome/distinfo b/x11-fonts/font-awesome/distinfo
index 856b33eab67a..058aebb66599 100644
--- a/x11-fonts/font-awesome/distinfo
+++ b/x11-fonts/font-awesome/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1671276472
-SHA256 (fontawesome-free-6.2.1-desktop.zip) = 518fefd95bba1095c3ad7df5b886966ec9e172f528a5279fca1c1c5e35e1bc56
-SIZE (fontawesome-free-6.2.1-desktop.zip) = 3465641
+TIMESTAMP = 1758015583
+SHA256 (fontawesome-free-7.0.1-desktop.zip) = 7e0d5cff6248ffe2a20cdfe71ca986d9423fc66738b48bb6d71fc393adea87e4
+SIZE (fontawesome-free-7.0.1-desktop.zip) = 6040157
diff --git a/x11-fonts/font-awesome/pkg-message b/x11-fonts/font-awesome/files/pkg-message.in
similarity index 57%
rename from x11-fonts/font-awesome/pkg-message
rename to x11-fonts/font-awesome/files/pkg-message.in
index c3516aab4778..60b1d9d6b498 100644
--- a/x11-fonts/font-awesome/pkg-message
+++ b/x11-fonts/font-awesome/files/pkg-message.in
@@ -1,8 +1,8 @@
 [
 { type: install
   message: <<EOM
 If you're upgrading from a previous version, you may need to update your configs
-to the new font families "Font Awesome 6 Free" and "Font Awesome 6 Free Solid".
+to the new font families "Font Awesome %%VER%% Free" and "Font Awesome %%VER%% Free Solid".
 EOM
 }
 ]