diff --git a/x11-fonts/vazirmatn/Makefile b/x11-fonts/vazirmatn/Makefile
index 547619a46aa0..17538d21a54b 100644
--- a/x11-fonts/vazirmatn/Makefile
+++ b/x11-fonts/vazirmatn/Makefile
@@ -1,39 +1,26 @@
 PORTNAME=	vazirmatn
-DISTVERSIONPREFIX=	v
 DISTVERSION=	33.003
 CATEGORIES=	x11-fonts
+MASTER_SITES=	https://github.com/rastikerdar/${PORTNAME}/releases/download/v${DISTVERSION}/
+DISTNAME=	${PORTNAME}-v${DISTVERSION}
 
 MAINTAINER=	armean.shirazi@gmail.com
 COMMENT=	Simple Persian/Arabic font
 WWW=		https://rastikerdar.github.io/vazirmatn/
 
 LICENSE=	OFL11
 LICENSE_FILE=	${WRKSRC}/OFL.txt
 
-USES=	fonts
-USE_GITHUB=	YES
-GH_ACCOUNT=	rastikerdar
+USES=		fonts zip
+
+EXTRACT_AFTER_ARGS=	-j -x *wght* *.woff2 *.css
 
 NO_ARCH=	YES
 NO_BUILD=	YES
+NO_WRKSUBDIR=	YES
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Round-Dots/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Round-Dots/misc/Farsi-Digits/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Round-Dots/misc/Farsi-Digits-Non-Latin/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Round-Dots/misc/Non-Latin/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Round-Dots/misc/UI/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Round-Dots/misc/UI-Farsi-Digits/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Round-Dots/misc/UI-Farsi-Digits-Non-Latin/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Round-Dots/misc/UI-Non-Latin/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/misc/Farsi-Digits/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/misc/Farsi-Digits-Non-Latin/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/misc/Non-Latin/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/misc/UI/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/misc/UI-Farsi-Digits/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/misc/UI-Farsi-Digits-Non-Latin/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/misc/UI-Non-Latin/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/vazirmatn/distinfo b/x11-fonts/vazirmatn/distinfo
index 55c3b7bd0e6a..b17dfb6bdf51 100644
--- a/x11-fonts/vazirmatn/distinfo
+++ b/x11-fonts/vazirmatn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745684766
-SHA256 (rastikerdar-vazirmatn-v33.003_GH0.tar.gz) = 17968963d941d8645b1a14fbeba7d2f256a985abb901c25a3ea40ce98e703f4e
-SIZE (rastikerdar-vazirmatn-v33.003_GH0.tar.gz) = 13368968
+TIMESTAMP = 1746091530
+SHA256 (vazirmatn-v33.003.zip) = 0a9afd41967e6f57096a56a181a23f81a2b999b62f1f2a4e4b26736580854fdb
+SIZE (vazirmatn-v33.003.zip) = 13047191