diff --git a/x11-fonts/noto-sans-lao/Makefile b/x11-fonts/noto-sans-lao/Makefile
index a167faf7ac84..75c53cd6cda7 100644
--- a/x11-fonts/noto-sans-lao/Makefile
+++ b/x11-fonts/noto-sans-lao/Makefile
@@ -1,28 +1,71 @@
 PORTNAME=	noto
 PORTVERSION=	2.003
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://github.com/notofonts/lao/releases/download/NotoSansLao-v${PORTVERSION}/
+#MASTER_SITES=	https://github.com/notofonts/notofonts.github.io/raw/NotoSansLao-v${PORTVERSION}/fonts/ \
+#		https://github.com/notofonts/notofonts.github.io/raw/NotoSansLao-v${PORTVERSION}/fonts/NotoSansLao/hinted/ttf/:fonts
+MASTER_SITES=	https://github.com/notofonts/notofonts.github.io/raw/noto-monthly-release-23.7.1/fonts/ \
+		https://github.com/notofonts/notofonts.github.io/raw/noto-monthly-release-23.7.1/fonts/NotoSansLao/hinted/ttf/:fonts
 PKGNAMESUFFIX=	-sans-lao
-DISTNAME=	NotoSansLao-v${PORTVERSION}
-DIST_SUBDIR=	Noto
+DISTFILES=	LICENSE \
+		${FONTS:S|$|:fonts|}
+DIST_SUBDIR=	Noto/SansLao/${PORTVERSION}
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Google Noto Sans Lao
 WWW=		https://fonts.google.com/noto \
 		https://notofonts.github.io/ \
-		https://github.com/notofonts/lao
+		https://github.com/notofonts/lao \
+		https://github.com/notofonts/notofonts.github.io/tree/main/fonts/NotoSansLao
 
 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=		NotoSansLao-Black.ttf \
+		NotoSansLao-Bold.ttf \
+		NotoSansLao-Condensed.ttf \
+		NotoSansLao-CondensedBlack.ttf \
+		NotoSansLao-CondensedBold.ttf \
+		NotoSansLao-CondensedExtraBold.ttf \
+		NotoSansLao-CondensedExtraLight.ttf \
+		NotoSansLao-CondensedLight.ttf \
+		NotoSansLao-CondensedMedium.ttf \
+		NotoSansLao-CondensedSemiBold.ttf \
+		NotoSansLao-CondensedThin.ttf \
+		NotoSansLao-ExtraBold.ttf \
+		NotoSansLao-ExtraCondensed.ttf \
+		NotoSansLao-ExtraCondensedBlack.ttf \
+		NotoSansLao-ExtraCondensedBold.ttf \
+		NotoSansLao-ExtraCondensedExtraBold.ttf \
+		NotoSansLao-ExtraCondensedExtraLight.ttf \
+		NotoSansLao-ExtraCondensedLight.ttf \
+		NotoSansLao-ExtraCondensedMedium.ttf \
+		NotoSansLao-ExtraCondensedSemiBold.ttf \
+		NotoSansLao-ExtraCondensedThin.ttf \
+		NotoSansLao-ExtraLight.ttf \
+		NotoSansLao-Light.ttf \
+		NotoSansLao-Medium.ttf \
+		NotoSansLao-Regular.ttf \
+		NotoSansLao-SemiBold.ttf \
+		NotoSansLao-SemiCondensed.ttf \
+		NotoSansLao-SemiCondensedBlack.ttf \
+		NotoSansLao-SemiCondensedBold.ttf \
+		NotoSansLao-SemiCondensedExtraBold.ttf \
+		NotoSansLao-SemiCondensedExtraLight.ttf \
+		NotoSansLao-SemiCondensedLight.ttf \
+		NotoSansLao-SemiCondensedMedium.ttf \
+		NotoSansLao-SemiCondensedSemiBold.ttf \
+		NotoSansLao-SemiCondensedThin.ttf \
+		NotoSansLao-Thin.ttf
+
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/NotoSansLao/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-lao/distinfo b/x11-fonts/noto-sans-lao/distinfo
index 73a19f1804ef..e5ed070f3c53 100644
--- a/x11-fonts/noto-sans-lao/distinfo
+++ b/x11-fonts/noto-sans-lao/distinfo
@@ -1,3 +1,75 @@
-TIMESTAMP = 1710676081
-SHA256 (Noto/NotoSansLao-v2.003.zip) = 5a87c31b1a40ef8147c1e84437e5f0ceba2d4dbbfc0b56a65821ad29870da8c0
-SIZE (Noto/NotoSansLao-v2.003.zip) = 4825278
+TIMESTAMP = 1715677678
+SHA256 (Noto/SansLao/2.003/LICENSE) = f2095b08bed08b23a6fe26112fcd679a2bee3f002eef077eb05d215ed1051bd8
+SIZE (Noto/SansLao/2.003/LICENSE) = 4374
+SHA256 (Noto/SansLao/2.003/NotoSansLao-Black.ttf) = 5af0ecf5bc7a3cdfc293ebf4ef044425fc907f77d7bc6413535ae527b9415cb9
+SIZE (Noto/SansLao/2.003/NotoSansLao-Black.ttf) = 37344
+SHA256 (Noto/SansLao/2.003/NotoSansLao-Bold.ttf) = 18e3bf1443320fa807f9b85a9971d2bc3efe28b41bb96f75fde2096acb316709
+SIZE (Noto/SansLao/2.003/NotoSansLao-Bold.ttf) = 37252
+SHA256 (Noto/SansLao/2.003/NotoSansLao-Condensed.ttf) = 78f9381e86c8916db60fb7cbdf78065398faf71c0c5f7494c582516f6db4eb0e
+SIZE (Noto/SansLao/2.003/NotoSansLao-Condensed.ttf) = 35824
+SHA256 (Noto/SansLao/2.003/NotoSansLao-CondensedBlack.ttf) = 577d0c48fe165bec0b367a7df968f9037b864198b15c113c0595241eb1435b0b
+SIZE (Noto/SansLao/2.003/NotoSansLao-CondensedBlack.ttf) = 36620
+SHA256 (Noto/SansLao/2.003/NotoSansLao-CondensedBold.ttf) = 5116fabe482089a9bc1844809a1ce2e1e0cac36ec0ef75645426dbcf684bce98
+SIZE (Noto/SansLao/2.003/NotoSansLao-CondensedBold.ttf) = 36688
+SHA256 (Noto/SansLao/2.003/NotoSansLao-CondensedExtraBold.ttf) = b1390bdfcc1e307a0072ac65f26c1b6113e5a4df684eff3ef8c6f5d216886f4e
+SIZE (Noto/SansLao/2.003/NotoSansLao-CondensedExtraBold.ttf) = 36968
+SHA256 (Noto/SansLao/2.003/NotoSansLao-CondensedExtraLight.ttf) = 1cafccf9579ca6e28f3ac99a42378c26f76f04b74964056cc1d88fcf37dd2fa2
+SIZE (Noto/SansLao/2.003/NotoSansLao-CondensedExtraLight.ttf) = 34224
+SHA256 (Noto/SansLao/2.003/NotoSansLao-CondensedLight.ttf) = dabceb52823744a9dc4afbf52a630a0002d848f7adf9afe550991869614891b2
+SIZE (Noto/SansLao/2.003/NotoSansLao-CondensedLight.ttf) = 34060
+SHA256 (Noto/SansLao/2.003/NotoSansLao-CondensedMedium.ttf) = e9bd93feab6121ab044970df6e83411b3ceaa3aa5e3787cea98b87ac5087af46
+SIZE (Noto/SansLao/2.003/NotoSansLao-CondensedMedium.ttf) = 36008
+SHA256 (Noto/SansLao/2.003/NotoSansLao-CondensedSemiBold.ttf) = 138573fe5f6d3fda2b58ec86ddfd952e908b6c02895f76d625d78847e32232c0
+SIZE (Noto/SansLao/2.003/NotoSansLao-CondensedSemiBold.ttf) = 35976
+SHA256 (Noto/SansLao/2.003/NotoSansLao-CondensedThin.ttf) = f15bdf0f272d1d785f5e1a29102fec956d958bc1c31bb89bfc9064687a95c61f
+SIZE (Noto/SansLao/2.003/NotoSansLao-CondensedThin.ttf) = 34084
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraBold.ttf) = 566277d4f6b81494a7dee5cf62e8a4989c223bcfd2142d9c04dc2f3eca2733ea
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraBold.ttf) = 37100
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraCondensed.ttf) = 05efd39950bb3b7ffd86c23d58977c2187addf2dee34fa5b1bdfe6e08f6ad2c0
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraCondensed.ttf) = 35808
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedBlack.ttf) = d0144675975d08e15887ce2c05defad874e1fa4c8546febf94932e28c89c3dcd
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedBlack.ttf) = 36600
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedBold.ttf) = cee25b48626bb1a6d75d6c75cc4af11643ac75a2b36fc376202220060ae8fe6e
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedBold.ttf) = 36752
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedExtraBold.ttf) = 01eb88171ca9f344ce85284943f3bbd6eed2b5c453b881a2ab4022ff2439c203
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedExtraBold.ttf) = 36244
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedExtraLight.ttf) = 32f106710113d1ebb1712c75a46a64f883473302c1e50e42222cb937082bd53f
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedExtraLight.ttf) = 34064
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedLight.ttf) = a611881834445959f9b7160614a695929d4a8d0cd5face24ae254a43704d15c0
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedLight.ttf) = 33892
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedMedium.ttf) = 2f4cbf184c97deda9b6fc9702c463a43aa962519a18c14f7ca80b2279022f5c3
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedMedium.ttf) = 36068
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedSemiBold.ttf) = 0b1a8f600a5887f2c186695ed5c6b6ae1a67caea9863947a141d62567ad3e150
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedSemiBold.ttf) = 36312
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedThin.ttf) = 9bfe462ac5fbbdc56d95aa6a431b4e7c5cd326fbf68628f24479899e1a95776d
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraCondensedThin.ttf) = 33920
+SHA256 (Noto/SansLao/2.003/NotoSansLao-ExtraLight.ttf) = ca2d8ecc126492ade5cf11e44d02f4bc2ddfba3a7abd270406e830a4826e2518
+SIZE (Noto/SansLao/2.003/NotoSansLao-ExtraLight.ttf) = 34748
+SHA256 (Noto/SansLao/2.003/NotoSansLao-Light.ttf) = 401639abb3d800a224505c616d45f977ba7d9793855fe7853817cd00e84c7b95
+SIZE (Noto/SansLao/2.003/NotoSansLao-Light.ttf) = 34288
+SHA256 (Noto/SansLao/2.003/NotoSansLao-Medium.ttf) = 0f2d921e4b7e3f0c3751c98d25e846feea5d2a4660c27b17aefb09663f08b6cd
+SIZE (Noto/SansLao/2.003/NotoSansLao-Medium.ttf) = 36116
+SHA256 (Noto/SansLao/2.003/NotoSansLao-Regular.ttf) = 0a86e5e1ccfe34ca78c43fac6829dc751b42bcc469272a9a55325aae587bfbe7
+SIZE (Noto/SansLao/2.003/NotoSansLao-Regular.ttf) = 35884
+SHA256 (Noto/SansLao/2.003/NotoSansLao-SemiBold.ttf) = 354558517ce01c2585862742ce150467ef4e1062c1e77d309b94cdaf03a451f8
+SIZE (Noto/SansLao/2.003/NotoSansLao-SemiBold.ttf) = 36584
+SHA256 (Noto/SansLao/2.003/NotoSansLao-SemiCondensed.ttf) = 4451fa9008c5468cebc77523911235718815a51903c9dadcba0ca12ea82d40fb
+SIZE (Noto/SansLao/2.003/NotoSansLao-SemiCondensed.ttf) = 35772
+SHA256 (Noto/SansLao/2.003/NotoSansLao-SemiCondensedBlack.ttf) = c43040b8d33f2ac0a7e7c0ac1c29a7bf117a7bbbbd2b15ec87a168a42d940519
+SIZE (Noto/SansLao/2.003/NotoSansLao-SemiCondensedBlack.ttf) = 37392
+SHA256 (Noto/SansLao/2.003/NotoSansLao-SemiCondensedBold.ttf) = 37ffbdb3285266fd3a0b2bf75e6d279715bd9c5b1ab4645b93e434978e44bd96
+SIZE (Noto/SansLao/2.003/NotoSansLao-SemiCondensedBold.ttf) = 37268
+SHA256 (Noto/SansLao/2.003/NotoSansLao-SemiCondensedExtraBold.ttf) = 83c8fbe70f37b5a77eb9e1fbb5499cb148a80a1678da4516c923549e4c3fc11e
+SIZE (Noto/SansLao/2.003/NotoSansLao-SemiCondensedExtraBold.ttf) = 37516
+SHA256 (Noto/SansLao/2.003/NotoSansLao-SemiCondensedExtraLight.ttf) = bfc9fda9c0596cd2b4cd131b18458099b49fc7cd45a97dbe266767b8c16ad250
+SIZE (Noto/SansLao/2.003/NotoSansLao-SemiCondensedExtraLight.ttf) = 34572
+SHA256 (Noto/SansLao/2.003/NotoSansLao-SemiCondensedLight.ttf) = 6c76aeae1cb71801ba8928ec36e662e4246895aecc780276d6d5cad2363c8159
+SIZE (Noto/SansLao/2.003/NotoSansLao-SemiCondensedLight.ttf) = 34432
+SHA256 (Noto/SansLao/2.003/NotoSansLao-SemiCondensedMedium.ttf) = e8cda5657a6ed22b46eb58ce062eb82253de00c5e2c5bbe9752d8edc5de01bae
+SIZE (Noto/SansLao/2.003/NotoSansLao-SemiCondensedMedium.ttf) = 36244
+SHA256 (Noto/SansLao/2.003/NotoSansLao-SemiCondensedSemiBold.ttf) = d0bf937bc04f7eca828697d4c71e07a08560aa8410d3f6fe5506c4270f25b33d
+SIZE (Noto/SansLao/2.003/NotoSansLao-SemiCondensedSemiBold.ttf) = 36288
+SHA256 (Noto/SansLao/2.003/NotoSansLao-SemiCondensedThin.ttf) = 20bedec69688636e3c8ee5dae61568e835f55cf5fb492ca815ffda2c21149e95
+SIZE (Noto/SansLao/2.003/NotoSansLao-SemiCondensedThin.ttf) = 34280
+SHA256 (Noto/SansLao/2.003/NotoSansLao-Thin.ttf) = d345d8b1012d95f43d5e70e3875a3623b8be152324601747d692015165937c17
+SIZE (Noto/SansLao/2.003/NotoSansLao-Thin.ttf) = 34256