diff --git a/x11-fonts/fira/Makefile b/x11-fonts/fira/Makefile
index b61e79a4d8dc..22aab45cf36b 100644
--- a/x11-fonts/fira/Makefile
+++ b/x11-fonts/fira/Makefile
@@ -1,38 +1,36 @@
 PORTNAME=	fira
-PORTVERSION=	4.301
-PORTREVISION=	1
+DISTVERSION=	4.301
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	trueos@norwegianrockcat.com
 COMMENT=	Sans-serif, monospaced, and code typeface for small screens
 WWW=		https://bboxtype.com/typefaces/FiraSans/
 
 LICENSE=	OFL11
 
-USES=		fonts xorg
-USE_XORG=	x11
+USES=		fonts
+
+EXTRACT_AFTER_ARGS=	--include ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/Fira_Code_3_2/Fonts/FiraCode_OTF_32/*.otf \
+			--include ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/Fira_Mono_3_2/Fonts/FiraMono_OTF_32/*.otf \
+			--include ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/Fira_Sans_4_3/Fonts/Fira_Sans_OTF_4301 \
+			--strip-components 4 \
+			--no-same-owner --no-same-permissions
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	bBoxType
 GH_PROJECT=	FiraSans
 GH_TAGNAME=	f54eeb3
+
 NO_ARCH=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 SUB_FILES=	pkg-message
 
-PORTDOCS=	*.pdf *.rtf
-
-OPTIONS_DEFINE=	DOCS
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${FIND} ${WRKSRC}/Fira* -type f -name \*.otf | while read f; do \
-		${INSTALL_DATA} $$f ${STAGEDIR}${FONTSDIR} ; done
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Fira*/PDF/*.pdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Fira_Sans_4_3/Fira_4_3_Change_Log.rtf \
-		${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*/*/*.otf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/fira/files/pkg-message.in b/x11-fonts/fira/files/pkg-message.in
index d84b4a24f1a3..8a84c5917ac9 100644
--- a/x11-fonts/fira/files/pkg-message.in
+++ b/x11-fonts/fira/files/pkg-message.in
@@ -1,23 +1,22 @@
 [
 { type: install
   message: <<EOM
 Fira has been installed.
 
 Fira has advanced Open Type typographic layout features and language support.
 Please refer to the Technical Documentation installed by this port or online at
 
     https://carrois.com/projects/Fira/
 
 For details about OpenType Layout Features see the OpenType Layout tag registry
 
     http://www.microsoft.com/typography/otspec/featurelist.htm
 
 or
 
     https://www.fontfont.com/staticcontent/downloads/FF_OT_User_Guide.pdf
     http://en.wikipedia.org/wiki/List_of_typographic_features
 
-For Web Font please use www/fira-webfont port.
 EOM
 }
 ]