diff --git a/x11-fonts/noto-sans-thai/Makefile b/x11-fonts/noto-sans-thai/Makefile
index a33b461969c1..c569942aaa27 100644
--- a/x11-fonts/noto-sans-thai/Makefile
+++ b/x11-fonts/noto-sans-thai/Makefile
@@ -1,28 +1,69 @@
 PORTNAME=	noto
 PORTVERSION=	2.002
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://github.com/notofonts/thai/releases/download/NotoSansThai-v${PORTVERSION}/
+MASTER_SITES=	https://github.com/notofonts/notofonts.github.io/raw/NotoSansThai-v${PORTVERSION}/fonts/ \
+		https://github.com/notofonts/notofonts.github.io/raw/NotoSansThai-v${PORTVERSION}/fonts/NotoSansThai/hinted/ttf/:fonts
 PKGNAMESUFFIX=	-sans-thai
-DISTNAME=	NotoSansThai-v${PORTVERSION}
-DIST_SUBDIR=	Noto
+DISTFILES=	LICENSE \
+		${FONTS:S|$|:fonts|}
+DIST_SUBDIR=	Noto/SansThai/${PORTVERSION}
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Google Noto Sans Thai
 WWW=		https://fonts.google.com/noto \
 		https://notofonts.github.io/ \
-		https://github.com/notofonts/thai
+		https://github.com/notofonts/thai \
+		https://github.com/notofonts/notofonts.github.io/tree/main/fonts/NotoSansThai
 
 LICENSE=	OFL11
-LICENSE_FILE=	${WRKSRC}/OFL.txt
+LICENSE_FILE=	${DISTDIR}/${DIST_SUBDIR}/LICENSE
 
-USES=		fonts zip
+USES=		fonts
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
+FONTS=		NotoSansThai-Black.ttf \
+		NotoSansThai-Bold.ttf \
+		NotoSansThai-Condensed.ttf \
+		NotoSansThai-CondensedBlack.ttf \
+		NotoSansThai-CondensedBold.ttf \
+		NotoSansThai-CondensedExtraBold.ttf \
+		NotoSansThai-CondensedExtraLight.ttf \
+		NotoSansThai-CondensedLight.ttf \
+		NotoSansThai-CondensedMedium.ttf \
+		NotoSansThai-CondensedSemiBold.ttf \
+		NotoSansThai-CondensedThin.ttf \
+		NotoSansThai-ExtraBold.ttf \
+		NotoSansThai-ExtraCondensed.ttf \
+		NotoSansThai-ExtraCondensedBlack.ttf \
+		NotoSansThai-ExtraCondensedBold.ttf \
+		NotoSansThai-ExtraCondensedExtraBold.ttf \
+		NotoSansThai-ExtraCondensedExtraLight.ttf \
+		NotoSansThai-ExtraCondensedLight.ttf \
+		NotoSansThai-ExtraCondensedMedium.ttf \
+		NotoSansThai-ExtraCondensedSemiBold.ttf \
+		NotoSansThai-ExtraCondensedThin.ttf \
+		NotoSansThai-ExtraLight.ttf \
+		NotoSansThai-Light.ttf \
+		NotoSansThai-Medium.ttf \
+		NotoSansThai-Regular.ttf \
+		NotoSansThai-SemiBold.ttf \
+		NotoSansThai-SemiCondensed.ttf \
+		NotoSansThai-SemiCondensedBlack.ttf \
+		NotoSansThai-SemiCondensedBold.ttf \
+		NotoSansThai-SemiCondensedExtraBold.ttf \
+		NotoSansThai-SemiCondensedExtraLight.ttf \
+		NotoSansThai-SemiCondensedLight.ttf \
+		NotoSansThai-SemiCondensedMedium.ttf \
+		NotoSansThai-SemiCondensedSemiBold.ttf \
+		NotoSansThai-SemiCondensedThin.ttf \
+		NotoSansThai-Thin.ttf
+
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/NotoSansThai/hinted/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
+	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${FONTS} ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/noto-sans-thai/distinfo b/x11-fonts/noto-sans-thai/distinfo
index 1fc2e20a569b..caa7d45b3308 100644
--- a/x11-fonts/noto-sans-thai/distinfo
+++ b/x11-fonts/noto-sans-thai/distinfo
@@ -1,3 +1,75 @@
-TIMESTAMP = 1710676095
-SHA256 (Noto/NotoSansThai-v2.002.zip) = af889cc673fc714060ce5e4e088fbad32aa4c0571a19958efeaff128a22da485
-SIZE (Noto/NotoSansThai-v2.002.zip) = 4720990
+TIMESTAMP = 1715677688
+SHA256 (Noto/SansThai/2.002/LICENSE) = f2095b08bed08b23a6fe26112fcd679a2bee3f002eef077eb05d215ed1051bd8
+SIZE (Noto/SansThai/2.002/LICENSE) = 4374
+SHA256 (Noto/SansThai/2.002/NotoSansThai-Black.ttf) = 9c4b2f43f9d4a7744572112b6a7443379bac781fe193a5ae45b786bfb9308d39
+SIZE (Noto/SansThai/2.002/NotoSansThai-Black.ttf) = 39128
+SHA256 (Noto/SansThai/2.002/NotoSansThai-Bold.ttf) = 2ac6c6e8a478e23b15f76e4894af1fa2210f8f350e4e6e54aad530bec03efbfb
+SIZE (Noto/SansThai/2.002/NotoSansThai-Bold.ttf) = 37824
+SHA256 (Noto/SansThai/2.002/NotoSansThai-Condensed.ttf) = 1aa3d489f8588c7cefcd55b7bf8cbce3b1f00cfd61449e5234e4608a320c3b10
+SIZE (Noto/SansThai/2.002/NotoSansThai-Condensed.ttf) = 37468
+SHA256 (Noto/SansThai/2.002/NotoSansThai-CondensedBlack.ttf) = ba86dd904642072b231e1c44a09138db35f5a50a7f4e95750b863bc82bb5c848
+SIZE (Noto/SansThai/2.002/NotoSansThai-CondensedBlack.ttf) = 38984
+SHA256 (Noto/SansThai/2.002/NotoSansThai-CondensedBold.ttf) = 2f8f20f76621ef8c056434fa089d50bcd6e19d82ccf7361a61c0be70f1f72524
+SIZE (Noto/SansThai/2.002/NotoSansThai-CondensedBold.ttf) = 37976
+SHA256 (Noto/SansThai/2.002/NotoSansThai-CondensedExtraBold.ttf) = 32592922a8400c9cfb41f228efef0c90d99341eced218bbd8c0daa3c584066f2
+SIZE (Noto/SansThai/2.002/NotoSansThai-CondensedExtraBold.ttf) = 38868
+SHA256 (Noto/SansThai/2.002/NotoSansThai-CondensedExtraLight.ttf) = 9a11920b726d53e43d2145341783bfe86cc7a6749499d6b3f90306369878b400
+SIZE (Noto/SansThai/2.002/NotoSansThai-CondensedExtraLight.ttf) = 35348
+SHA256 (Noto/SansThai/2.002/NotoSansThai-CondensedLight.ttf) = df1f11989e106febf257016bc74092f5e40bead99695292358ce732d374eacdf
+SIZE (Noto/SansThai/2.002/NotoSansThai-CondensedLight.ttf) = 35372
+SHA256 (Noto/SansThai/2.002/NotoSansThai-CondensedMedium.ttf) = ba0747ef44a5e71cb7ee0c832eda136c8936be519d6e7fa6ad39621f17070b47
+SIZE (Noto/SansThai/2.002/NotoSansThai-CondensedMedium.ttf) = 37916
+SHA256 (Noto/SansThai/2.002/NotoSansThai-CondensedSemiBold.ttf) = 70326548602f3fb27798086e1b25b3049cc504da8b46db2a916b0a079a495a2d
+SIZE (Noto/SansThai/2.002/NotoSansThai-CondensedSemiBold.ttf) = 38368
+SHA256 (Noto/SansThai/2.002/NotoSansThai-CondensedThin.ttf) = da99030890b68116945eab9e293cec260ca55930248f4dfef8c0c38e557db77d
+SIZE (Noto/SansThai/2.002/NotoSansThai-CondensedThin.ttf) = 34648
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraBold.ttf) = cbb0875722642a858a2f4d48b5670e346f315d1dc9190ead0e256250e37ecfb0
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraBold.ttf) = 38940
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraCondensed.ttf) = df58a7a7140f66768564d2fc2187d821ca6a2b67c5ee86146d51e91f32af226d
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraCondensed.ttf) = 37320
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedBlack.ttf) = ae3663a75430f6b85de20469607484a0f77fcce5dbf7cc1c534580a70e1b52b0
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedBlack.ttf) = 38692
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedBold.ttf) = 2cbfefb5693d067f5b84f6e9a2844319e6e0e061b5b7227a6d6502ad00ffbb0f
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedBold.ttf) = 37752
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedExtraBold.ttf) = ae5270c3397ee4f14c982b95c312252534267c3a65f82bbc244560209083276a
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedExtraBold.ttf) = 38256
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedExtraLight.ttf) = 00a4bdae017d9c32aa910a7b955ce1b962bda170d7c72aefe3959ca1e123da04
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedExtraLight.ttf) = 35448
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedLight.ttf) = e5b5d4b6335aafd6d44267a69f1d6feaa421a6c9c38dc216c71d0b0b133775d5
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedLight.ttf) = 35348
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedMedium.ttf) = 138185b907dbcee3dc0b7bba5db7fa419117997148f3173fee7e0f1bf99f0bac
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedMedium.ttf) = 37928
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedSemiBold.ttf) = e22cfae742551e34fe8c9ea23f8e02cd3e531d07c40d43658a6353cd44bb7018
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedSemiBold.ttf) = 38236
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedThin.ttf) = 3fa5374dabd82cdda730f73de1e34960a68056be34f690ab8cff73e44e3fcb0b
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraCondensedThin.ttf) = 34620
+SHA256 (Noto/SansThai/2.002/NotoSansThai-ExtraLight.ttf) = 7524ab9bc42cafe3eed3ed1c1892af7e9748c3792c7319b2fac9dcd628665fb8
+SIZE (Noto/SansThai/2.002/NotoSansThai-ExtraLight.ttf) = 35028
+SHA256 (Noto/SansThai/2.002/NotoSansThai-Light.ttf) = 7c80ff717c98ce61e8804a0cc9285357c24755ac2d622ce53e3df7d1c9978672
+SIZE (Noto/SansThai/2.002/NotoSansThai-Light.ttf) = 35508
+SHA256 (Noto/SansThai/2.002/NotoSansThai-Medium.ttf) = 11bc8f6cf3523241995f07225fcc7d8e25eb55064fbfa39281a5e44dcd59f5f5
+SIZE (Noto/SansThai/2.002/NotoSansThai-Medium.ttf) = 38296
+SHA256 (Noto/SansThai/2.002/NotoSansThai-Regular.ttf) = 61cf814eec46b294d6ea4401ac295d0cecd5207bd2331dcc5a15e7301d30ee44
+SIZE (Noto/SansThai/2.002/NotoSansThai-Regular.ttf) = 37780
+SHA256 (Noto/SansThai/2.002/NotoSansThai-SemiBold.ttf) = d19ec702c2ddc26f74ccf934342147afd8bce43eb1435fa46a06ab93e368011b
+SIZE (Noto/SansThai/2.002/NotoSansThai-SemiBold.ttf) = 38520
+SHA256 (Noto/SansThai/2.002/NotoSansThai-SemiCondensed.ttf) = 3fb3c7afc952094fae5ac2b84150a5978269daeb98fdc55a431188869cba3cd7
+SIZE (Noto/SansThai/2.002/NotoSansThai-SemiCondensed.ttf) = 37520
+SHA256 (Noto/SansThai/2.002/NotoSansThai-SemiCondensedBlack.ttf) = e44fc860ce55dcf05b2c97f164025140819f15199cd25a0b8bd3958a2ee33be3
+SIZE (Noto/SansThai/2.002/NotoSansThai-SemiCondensedBlack.ttf) = 39460
+SHA256 (Noto/SansThai/2.002/NotoSansThai-SemiCondensedBold.ttf) = 91a419be1cecf95959c176255b686d6255cc61c646db23a506d65e656458d160
+SIZE (Noto/SansThai/2.002/NotoSansThai-SemiCondensedBold.ttf) = 37712
+SHA256 (Noto/SansThai/2.002/NotoSansThai-SemiCondensedExtraBold.ttf) = 564f1abd925df22dff8d1a696edba91cc96c77ff984c1d5eae96f4f0ca2dc054
+SIZE (Noto/SansThai/2.002/NotoSansThai-SemiCondensedExtraBold.ttf) = 38840
+SHA256 (Noto/SansThai/2.002/NotoSansThai-SemiCondensedExtraLight.ttf) = 505fd2ea2e53ddced7e36671d605ab46c1d93ef0dee68291492815904990afbf
+SIZE (Noto/SansThai/2.002/NotoSansThai-SemiCondensedExtraLight.ttf) = 35640
+SHA256 (Noto/SansThai/2.002/NotoSansThai-SemiCondensedLight.ttf) = 03b34a733cb28b9d7614e66b1e5f36d2e92fcb1460153669a901317b3d99366a
+SIZE (Noto/SansThai/2.002/NotoSansThai-SemiCondensedLight.ttf) = 35648
+SHA256 (Noto/SansThai/2.002/NotoSansThai-SemiCondensedMedium.ttf) = 27dcbc6e93a4d87ed5214219283f0469b454f89291b2cc706a04caf230967f7d
+SIZE (Noto/SansThai/2.002/NotoSansThai-SemiCondensedMedium.ttf) = 38276
+SHA256 (Noto/SansThai/2.002/NotoSansThai-SemiCondensedSemiBold.ttf) = c5648dc2eda1bad77a477e5404af9366da9d02696d900017e0c3dac955da36a7
+SIZE (Noto/SansThai/2.002/NotoSansThai-SemiCondensedSemiBold.ttf) = 38304
+SHA256 (Noto/SansThai/2.002/NotoSansThai-SemiCondensedThin.ttf) = 6669ae21386def9563f80abde5dc7d61159d57a8d431fbee80dad1d2771f0861
+SIZE (Noto/SansThai/2.002/NotoSansThai-SemiCondensedThin.ttf) = 34700
+SHA256 (Noto/SansThai/2.002/NotoSansThai-Thin.ttf) = 6aa7bc5379ae3c5f2bcc62ef455cbb01f336c86b5919650e5961d930d4fdc078
+SIZE (Noto/SansThai/2.002/NotoSansThai-Thin.ttf) = 34812