diff --git a/x11-fonts/font-awesome/Makefile b/x11-fonts/font-awesome/Makefile
index 4aec79268918..f9f55046f79c 100644
--- a/x11-fonts/font-awesome/Makefile
+++ b/x11-fonts/font-awesome/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	font-awesome
-DISTVERSION=	5.14.0
+DISTVERSION=	6.1.1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://use.fontawesome.com/releases/v${DISTVERSION}/
 DISTNAME=	fontawesome-free-${DISTVERSION}-desktop
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Suite of pictographic icons from Font Awesome (free version)
 
 LICENSE=	OFL11
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		fonts zip
 
 PORTSCOUT=	site:https://github.com/FortAwesome/Font-Awesome/releases
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
-PLIST_FILES=	${FONTSDIR}/Font\ Awesome\ 5\ Brands-Regular-400.otf \
-		${FONTSDIR}/Font\ Awesome\ 5\ Free-Regular-400.otf \
-		${FONTSDIR}/Font\ Awesome\ 5\ Free-Solid-900.otf
+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
 
 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 a8f3a08e7df8..26bee302c248 100644
--- a/x11-fonts/font-awesome/distinfo
+++ b/x11-fonts/font-awesome/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596210727
-SHA256 (fontawesome-free-5.14.0-desktop.zip) = 3295a2578a9fec3bf12f485a3ddba23eea8eab5802580c3de81ebc292405eeeb
-SIZE (fontawesome-free-5.14.0-desktop.zip) = 2068408
+TIMESTAMP = 1650337923
+SHA256 (fontawesome-free-6.1.1-desktop.zip) = 73366012c82155f4ba78e842d15f5e49597bb21320d85c63ea984d788791b267
+SIZE (fontawesome-free-6.1.1-desktop.zip) = 3122377
diff --git a/x11-fonts/font-awesome/files/pkg-message.in b/x11-fonts/font-awesome/files/pkg-message.in
index 87a0fe9ca97c..c3516aab4778 100644
--- a/x11-fonts/font-awesome/files/pkg-message.in
+++ b/x11-fonts/font-awesome/files/pkg-message.in
@@ -1,12 +1,8 @@
 [
 { type: install
   message: <<EOM
-Add the following line to the "Files" section of X Windows configuration file:
-
-        FontPath "%%FONTSDIR%%/"
-
-If you're upgrading from Font Awesome v4, you may need to update your configs
-to the new font families "Font Awesome 5 Free" and "Font Awesome 5 Free Solid".
+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".
 EOM
 }
 ]