diff --git a/x11-fonts/monaspace/Makefile b/x11-fonts/monaspace/Makefile
index d4486ce28b12..7444cea3a7c3 100644
--- a/x11-fonts/monaspace/Makefile
+++ b/x11-fonts/monaspace/Makefile
@@ -1,28 +1,35 @@
 PORTNAME=	monaspace
-DISTVERSION=	1.101
+DISTVERSION=	1.400
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://github.com/githubnext/monaspace/releases/download/v${DISTVERSION}/
-DISTNAME=	${PORTNAME}-v${DISTVERSION}
+DISTFILES=	${PORTNAME}-static-v${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-variable-v${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Innovative superfamily of fonts for code
 WWW=		https://monaspace.githubnext.com
 
 LICENSE=	OFL11
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		fonts zip
 
 NO_ARCH=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 
-	${INSTALL_DATA} ${WRKSRC}/fonts/otf/*.otf ${STAGEDIR}${FONTSDIR}
-	${LS} ${STAGEDIR}${FONTSDIR}/*.otf | ${SED} -e's,^${STAGEDIR},,' >> ${TMPPLIST}
+	@cd ${WRKSRC}/"Static Fonts" && ${FIND} . -name '*.otf' | while read f; do \
+		${INSTALL_DATA} "$$f" ${STAGEDIR}${FONTSDIR}; \
+	done
 
-	${INSTALL_DATA} ${WRKSRC}/fonts/variable/*.ttf ${STAGEDIR}${FONTSDIR}
-	${LS} ${STAGEDIR}${FONTSDIR}/*.ttf | ${SED} -e's,^${STAGEDIR},,' >> ${TMPPLIST}
+	@cd ${WRKSRC}/"Variable Fonts" && ${FIND} . -name '*.ttf' | while read f; do \
+		${INSTALL_DATA} "$$f" \
+			${STAGEDIR}${FONTSDIR}/`${BASENAME} "$$f" | ${TR} -d ' '`; \
+	done
+
+	${LS} ${STAGEDIR}${FONTSDIR}/*.otf ${STAGEDIR}${FONTSDIR}/*.ttf | \
+		${SED} -e's,^${STAGEDIR},,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/monaspace/distinfo b/x11-fonts/monaspace/distinfo
index 5a45a8c87c4a..864e4e2624a5 100644
--- a/x11-fonts/monaspace/distinfo
+++ b/x11-fonts/monaspace/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1715336011
-SHA256 (monaspace-v1.101.zip) = 7ff2317c7bdaed8e81dcbe1314e6ab12ad9641b7ddf921e996a227ff4ec7752f
-SIZE (monaspace-v1.101.zip) = 36830244
+TIMESTAMP = 1787347331
+SHA256 (monaspace-static-v1.400.zip) = ab66d71be751495f679727332a3345597943bd4d7beebca03f5cde04bf994de7
+SIZE (monaspace-static-v1.400.zip) = 55607551
+SHA256 (monaspace-variable-v1.400.zip) = b69a7f2a3c455c89dcb6cc23b61bb3fb8beecba728ccdebeccd80577e58de0c8
+SIZE (monaspace-variable-v1.400.zip) = 4208172