diff --git a/x11-fonts/urw-core35-fonts/Makefile b/x11-fonts/urw-core35-fonts/Makefile
index 49bc25b7b26c..33a4c90f7e1c 100644
--- a/x11-fonts/urw-core35-fonts/Makefile
+++ b/x11-fonts/urw-core35-fonts/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	urw-core35-fonts
-DISTVERSION=	2017-08-04
+DISTVERSION=	20200910
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://git.ghostscript.com/?p=urw-core35-fonts.git;a=snapshot;h=${GIT_COMMIT};sf=tgz;dummy=/
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	URW core35 fonts in various formats
@@ -9,19 +8,18 @@ COMMENT=	URW core35 fonts in various formats
 LICENSE=	AGPLv3
 
 USES=		fonts
+USE_GITHUB=	yes
+GH_ACCOUNT=	ArtifexSoftware
+GH_PROJECT=	urw-base35-fonts
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${GIT_COMMIT}
-
-GIT_COMMIT=	91edd6e
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.afm ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.t1 ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.otf ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.ttf ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.afm ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.t1 ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/urw-core35-fonts/distinfo b/x11-fonts/urw-core35-fonts/distinfo
index f8f6f303308a..bac0e144e723 100644
--- a/x11-fonts/urw-core35-fonts/distinfo
+++ b/x11-fonts/urw-core35-fonts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605277787
-SHA256 (urw-core35-fonts-2017-08-04.tar.gz) = 1e8d2bf93c7aed3301e2a12c672cdcf44ef50f250a57db6534ff2fb298307fa0
-SIZE (urw-core35-fonts-2017-08-04.tar.gz) = 11128006
+TIMESTAMP = 1623735319
+SHA256 (ArtifexSoftware-urw-base35-fonts-20200910_GH0.tar.gz) = e0d9b7f11885fdfdc4987f06b2aa0565ad2a4af52b22e5ebf79e1a98abd0ae2f
+SIZE (ArtifexSoftware-urw-base35-fonts-20200910_GH0.tar.gz) = 11190093
diff --git a/x11-fonts/urw-core35-fonts/pkg-plist b/x11-fonts/urw-core35-fonts/pkg-plist
index 845c81c71266..7b3fa21d9abd 100644
--- a/x11-fonts/urw-core35-fonts/pkg-plist
+++ b/x11-fonts/urw-core35-fonts/pkg-plist
@@ -66,10 +66,10 @@
 %%FONTSDIR%%/NimbusSans-Regular.otf
 %%FONTSDIR%%/NimbusSans-Regular.t1
 %%FONTSDIR%%/NimbusSans-Regular.ttf
-%%FONTSDIR%%/NimbusSansNarrow-BdOblique.afm
-%%FONTSDIR%%/NimbusSansNarrow-BdOblique.otf
-%%FONTSDIR%%/NimbusSansNarrow-BdOblique.t1
-%%FONTSDIR%%/NimbusSansNarrow-BdOblique.ttf
+%%FONTSDIR%%/NimbusSansNarrow-BoldOblique.afm
+%%FONTSDIR%%/NimbusSansNarrow-BoldOblique.otf
+%%FONTSDIR%%/NimbusSansNarrow-BoldOblique.t1
+%%FONTSDIR%%/NimbusSansNarrow-BoldOblique.ttf
 %%FONTSDIR%%/NimbusSansNarrow-Bold.afm
 %%FONTSDIR%%/NimbusSansNarrow-Bold.otf
 %%FONTSDIR%%/NimbusSansNarrow-Bold.t1