diff --git a/fonts/fantasque-sans/Makefile b/fonts/fantasque-sans/Makefile
index 80cbbd7ec0d..305d67d60d0 100644
--- a/fonts/fantasque-sans/Makefile
+++ b/fonts/fantasque-sans/Makefile
@@ -1,29 +1,29 @@
-COMMENT =			programming font designed with functionality in mind
+COMMENT-main =	programming font designed with functionality in mind
+COMMENT-web =	programming (web)font designed with functionality in mind
 
-V =				1.8.0
-DISTNAME =			fantasque-sans-$V
-DISTFILES =			${DISTNAME}{FantasqueSansMono-Normal}.tar.gz
-REVISION =			1
+MULTI_PACKAGES =	-main -web
 
-CATEGORIES =			fonts
+MODFONT_FAMILY =	fantasque-sans
+MODFONT_VERSION =	1.8.0
+DIST_SUBDIR =		${PKGNAME}
+DISTNAME =		FantasqueSansMono-Normal
+REVISION =		2
+
+MODULES =		font
 
 HOMEPAGE =			https://fontlibrary.org/en/font/fantasque-sans-mono
 
 # SIL OFL 1.1
 PERMIT_PACKAGE =		Yes
 
-SITES =	https://github.com/belluzj/fantasque-sans/releases/download/v$V/
+SITES =	https://github.com/belluzj/fantasque-sans/releases/download/v${MODFONT_VERSION}/
 
 NO_BUILD =			Yes
 NO_TEST =			Yes
 
-PKG_ARCH =			*
+WRKDIST =	${WRKDIR}
 
-FONTDIR =			${PREFIX}/share/fonts/fantasque-sans
-
-do-install:
-	${INSTALL_DATA_DIR} ${FONTDIR}
-	${INSTALL_DATA} ${WRKDIR}/OTF/*.otf ${FONTDIR}
-	${INSTALL_DATA} ${WRKDIR}/TTF/*.ttf ${FONTDIR}
+MODFONT_FONTFILES =	OTF/*.otf TTF/*.ttf
+MODFONT_WEBFILES =	Webfonts/*.woff2
 
 .include <bsd.port.mk>
diff --git a/fonts/fantasque-sans/distinfo b/fonts/fantasque-sans/distinfo
index d0889ef9fe9..47483bbbbd2 100644
--- a/fonts/fantasque-sans/distinfo
+++ b/fonts/fantasque-sans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fantasque-sans-1.8.0.tar.gz) = ZFcJpU6m+6JMkmE1ohPTQt2xjw+LSfTmBLIhC3PpBoo=
-SIZE (fantasque-sans-1.8.0.tar.gz) = 1733798
+SHA256 (fantasque-sans-1.8.0/FantasqueSansMono-Normal.zip) = hL5oniMf93PtnTUug9zNgVHZ5EXxywuIyw6TMPxNnPw=
+SIZE (fantasque-sans-1.8.0/FantasqueSansMono-Normal.zip) = 1733018
diff --git a/fonts/fantasque-sans/pkg/DESCR b/fonts/fantasque-sans/pkg/DESCR-main
similarity index 100%
rename from fonts/fantasque-sans/pkg/DESCR
rename to fonts/fantasque-sans/pkg/DESCR-main
diff --git a/fonts/fantasque-sans/pkg/DESCR-web b/fonts/fantasque-sans/pkg/DESCR-web
new file mode 100644
index 00000000000..38f8aa54e39
--- /dev/null
+++ b/fonts/fantasque-sans/pkg/DESCR-web
@@ -0,0 +1,3 @@
+Fantasque Sans Mono is a programming font, designed with functionality
+in mind, and with some wibbly-wobbly handwriting-like fuzziness that
+makes it unassumingly cool.
diff --git a/fonts/fantasque-sans/pkg/PLIST b/fonts/fantasque-sans/pkg/PLIST-main
similarity index 100%
rename from fonts/fantasque-sans/pkg/PLIST
rename to fonts/fantasque-sans/pkg/PLIST-main
diff --git a/fonts/fantasque-sans/pkg/PLIST-web b/fonts/fantasque-sans/pkg/PLIST-web
new file mode 100644
index 00000000000..7a9f5ce061a
--- /dev/null
+++ b/fonts/fantasque-sans/pkg/PLIST-web
@@ -0,0 +1,6 @@
+fonts/
+fonts/fantasque-sans/
+fonts/fantasque-sans/FantasqueSansMono-Bold.woff2
+fonts/fantasque-sans/FantasqueSansMono-BoldItalic.woff2
+fonts/fantasque-sans/FantasqueSansMono-Italic.woff2
+fonts/fantasque-sans/FantasqueSansMono-Regular.woff2