diff --git a/x11-fonts/opensans-ttf/Makefile b/x11-fonts/opensans-ttf/Makefile
index 5e2766010854..e4e76362e61f 100644
--- a/x11-fonts/opensans-ttf/Makefile
+++ b/x11-fonts/opensans-ttf/Makefile
@@ -1,29 +1,29 @@
-PORTNAME=	open-sans
-PORTVERSION=	20180831
+PORTNAME=	opensans
+DISTVERSION=	3.003
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://www.opensans.com/download/
-DISTFILES=	${PORTNAME}.zip \
-		${PORTNAME}-condensed.zip
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
+PKGNAMESUFFIX=	-ttf
 
-MAINTAINER=	flo@snakeoilproductions.net
+MAINTAINER=	duchateau.olivier@gmail.com
 COMMENT=	Clean and modern sans-serif typeface
-WWW=		https://www.opensans.com
+WWW=		https://github.com/googlefonts/opensans/
 
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/Apache\ License.txt
+LICENSE=	OFL11
+LICENSE_FILE=	${WRKSRC}/OFL.txt
 
-USES=		fonts zip
+USES=		fonts
 
-BROKEN=		Unfetchable
-EXPIRATION_DATE=2026-01-31
+USE_GITHUB=	yes
+GH_ACCOUNT=	googlefonts
+GH_TAGNAME=	bd7e376 # v3.003
 
+EXTRACT_AFTER_ARGS=	--include ${WRKSRC:T}/OFL.txt \
+			--include ${WRKSRC:T}/fonts/ttf/*.ttf \
+			--no-same-owner --no-same-permissions
 NO_ARCH=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts/ttf/*.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/opensans-ttf/distinfo b/x11-fonts/opensans-ttf/distinfo
index 2ae178b91513..6f6e435a2c52 100644
--- a/x11-fonts/opensans-ttf/distinfo
+++ b/x11-fonts/opensans-ttf/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1535741654
-SHA256 (open-sans-20180831/open-sans.zip) = 36bf1f3d470840208e0e617a6bad793111c7f535cd4339e07618aaf4c179fd0c
-SIZE (open-sans-20180831/open-sans.zip) = 1168214
-SHA256 (open-sans-20180831/open-sans-condensed.zip) = ba2f7d5406004efbd425b6fdf68b5e432f6ec621c3333ef2dd1e5d2894918848
-SIZE (open-sans-20180831/open-sans-condensed.zip) = 358688
+TIMESTAMP = 1765820877
+SHA256 (googlefonts-opensans-3.003-bd7e376_GH0.tar.gz) = 2dbf827812cf89ecc25f10c995fd7dddf47277be13741c10b963e2351574ba93
+SIZE (googlefonts-opensans-3.003-bd7e376_GH0.tar.gz) = 31071052
diff --git a/x11-fonts/opensans-ttf/pkg-plist b/x11-fonts/opensans-ttf/pkg-plist
index 2268b479accf..c029566a0efa 100644
--- a/x11-fonts/opensans-ttf/pkg-plist
+++ b/x11-fonts/opensans-ttf/pkg-plist
@@ -1,13 +1,20 @@
 %%FONTSDIR%%/OpenSans-Bold.ttf
 %%FONTSDIR%%/OpenSans-BoldItalic.ttf
-%%FONTSDIR%%/OpenSans-CondBold.ttf
-%%FONTSDIR%%/OpenSans-CondLight.ttf
-%%FONTSDIR%%/OpenSans-CondLightItalic.ttf
+%%FONTSDIR%%/OpenSans-CondensedBold.ttf
+%%FONTSDIR%%/OpenSans-CondensedBoldItalic.ttf
+%%FONTSDIR%%/OpenSans-CondensedExtraBold.ttf
+%%FONTSDIR%%/OpenSans-CondensedExtraBoldItalic.ttf
+%%FONTSDIR%%/OpenSans-CondensedItalic.ttf
+%%FONTSDIR%%/OpenSans-CondensedLight.ttf
+%%FONTSDIR%%/OpenSans-CondensedLightItalic.ttf
+%%FONTSDIR%%/OpenSans-CondensedRegular.ttf
+%%FONTSDIR%%/OpenSans-CondensedSemiBold.ttf
+%%FONTSDIR%%/OpenSans-CondensedSemiBoldItalic.ttf
 %%FONTSDIR%%/OpenSans-ExtraBold.ttf
 %%FONTSDIR%%/OpenSans-ExtraBoldItalic.ttf
 %%FONTSDIR%%/OpenSans-Italic.ttf
 %%FONTSDIR%%/OpenSans-Light.ttf
 %%FONTSDIR%%/OpenSans-LightItalic.ttf
 %%FONTSDIR%%/OpenSans-Regular.ttf
-%%FONTSDIR%%/OpenSans-Semibold.ttf
-%%FONTSDIR%%/OpenSans-SemiboldItalic.ttf
+%%FONTSDIR%%/OpenSans-SemiBold.ttf
+%%FONTSDIR%%/OpenSans-SemiBoldItalic.ttf