diff --git a/x11-fonts/manrope/Makefile b/x11-fonts/manrope/Makefile
index efb6443d4ae2..887aed388c95 100644
--- a/x11-fonts/manrope/Makefile
+++ b/x11-fonts/manrope/Makefile
@@ -1,28 +1,27 @@
 PORTNAME=	manrope
-DISTVERSION=	4.20211221
+DISTVERSION=	4.505
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://www.gent.media/assets/manrope/
-DISTNAME=	manrope
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Modern geometric sans-serif font
 WWW=		https://www.gent.media/manrope
 
 LICENSE=	OFL11
 
-USES=		fonts zip
+USES=		fonts
 FONTNAME=	Manrope
+USE_GITHUB=	yes
+GH_ACCOUNT=	googlefonts
+GH_TAGNAME=	468c0dbe38efa331b80bfe9448256abe27be44c3
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-NO_WRKSUBDIR=	yes
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/fonts/ttf/* ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/fonts/otf/* ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/fonts/webfonts/* ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/fonts/variable/* ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/manrope/distinfo b/x11-fonts/manrope/distinfo
index 9876b3103af3..ffbae877483d 100644
--- a/x11-fonts/manrope/distinfo
+++ b/x11-fonts/manrope/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727716399
-SHA256 (manrope.zip) = 55df46e6c66a7dce193f234001327d94f4bc9e972b8499d11ba9c2eefcc9f4d9
-SIZE (manrope.zip) = 1143553
+TIMESTAMP = 1789746454
+SHA256 (googlefonts-manrope-4.505-468c0dbe38efa331b80bfe9448256abe27be44c3_GH0.tar.gz) = b59b1ba700164d99711411645207ec4ec816b1e49466fcb255e750d7a2bd636e
+SIZE (googlefonts-manrope-4.505-468c0dbe38efa331b80bfe9448256abe27be44c3_GH0.tar.gz) = 1271772
diff --git a/x11-fonts/manrope/pkg-plist b/x11-fonts/manrope/pkg-plist
index 0568d797248f..088e6b1eb211 100644
--- a/x11-fonts/manrope/pkg-plist
+++ b/x11-fonts/manrope/pkg-plist
@@ -1,23 +1,23 @@
-%%FONTSDIR%%/Manrope-Bold.otf
-%%FONTSDIR%%/Manrope-Bold.ttf
 %%FONTSDIR%%/Manrope-Bold.woff2
-%%FONTSDIR%%/Manrope-ExtraBold.otf
-%%FONTSDIR%%/Manrope-ExtraBold.ttf
 %%FONTSDIR%%/Manrope-ExtraBold.woff2
 %%FONTSDIR%%/Manrope-ExtraLight.otf
 %%FONTSDIR%%/Manrope-ExtraLight.ttf
 %%FONTSDIR%%/Manrope-ExtraLight.woff2
-%%FONTSDIR%%/Manrope-Light.otf
-%%FONTSDIR%%/Manrope-Light.ttf
 %%FONTSDIR%%/Manrope-Light.woff2
-%%FONTSDIR%%/Manrope-Medium.otf
-%%FONTSDIR%%/Manrope-Medium.ttf
 %%FONTSDIR%%/Manrope-Medium.woff2
-%%FONTSDIR%%/Manrope-Regular.otf
-%%FONTSDIR%%/Manrope-Regular.ttf
 %%FONTSDIR%%/Manrope-Regular.woff2
-%%FONTSDIR%%/Manrope-SemiBold.otf
-%%FONTSDIR%%/Manrope-SemiBold.ttf
 %%FONTSDIR%%/Manrope-SemiBold.woff2
 %%FONTSDIR%%/Manrope[wght].ttf
 %%FONTSDIR%%/Manrope[wght].woff2
+%%FONTSDIR%%/manrope-bold.otf
+%%FONTSDIR%%/manrope-bold.ttf
+%%FONTSDIR%%/manrope-extrabold.otf
+%%FONTSDIR%%/manrope-extrabold.ttf
+%%FONTSDIR%%/manrope-light.otf
+%%FONTSDIR%%/manrope-light.ttf
+%%FONTSDIR%%/manrope-medium.otf
+%%FONTSDIR%%/manrope-medium.ttf
+%%FONTSDIR%%/manrope-regular.otf
+%%FONTSDIR%%/manrope-regular.ttf
+%%FONTSDIR%%/manrope-semibold.otf
+%%FONTSDIR%%/manrope-semibold.ttf