diff --git a/x11-fonts/gentium-plus/Makefile b/x11-fonts/gentium-plus/Makefile
index eddafad66625..1e2e6955f219 100644
--- a/x11-fonts/gentium-plus/Makefile
+++ b/x11-fonts/gentium-plus/Makefile
@@ -1,38 +1,53 @@
 # Created by: Matthew Seaman
 
 PORTNAME=	GentiumPlus
-PORTREVISION=	1
-PORTVERSION=	5.000
+PORTVERSION=	6.000
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://software.sil.org/downloads/gentium/
+MASTER_SITES=	http://software.sil.org/downloads/r/gentium/
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Gentium Plus TrueType font collection
 
 LICENSE=	OFL11
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USES=		fonts zip
 
-PLIST_FILES=	${FONTSDIR}/${PORTNAME}-I.ttf \
-		${FONTSDIR}/${PORTNAME}-R.ttf
+PLIST_FILES=	${FONTSDIR}/GentiumBookPlus-Bold.ttf       \
+		${FONTSDIR}/GentiumBookPlus-BoldItalic.ttf \
+		${FONTSDIR}/GentiumBookPlus-Italic.ttf     \
+		${FONTSDIR}/GentiumBookPlus-Regular.ttf    \
+		${FONTSDIR}/GentiumPlus-Bold.ttf           \
+		${FONTSDIR}/GentiumPlus-BoldItalic.ttf     \
+		${FONTSDIR}/GentiumPlus-Italic.ttf         \
+		${FONTSDIR}/GentiumPlus-Regular.ttf
 
 SUB_FILES=	pkg-message
 
-DOCSLIST=	FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt OFL.txt \
-		README.txt documentation/GentiumPlus-features.pdf
+DOCSLIST=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt \
+		documentation/pdf/resources.pdf            \
+		documentation/pdf/features.pdf             \
+		documentation/pdf/developer.pdf            \
+		documentation/pdf/design.pdf               \
+		documentation/pdf/faq.pdf                  \
+		documentation/pdf/about.pdf                \
+		documentation/pdf/history.pdf              \
+		documentation/pdf/index.pdf                \
+		documentation/pdf/charset.pdf              \
+		documentation/pdf/support.pdf              \
+		documentation/pdf/versions.pdf
 PORTDOCS=	${DOCSLIST:C,^.*/,,}
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCSLIST:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/gentium-plus/distinfo b/x11-fonts/gentium-plus/distinfo
index ced2632da97b..380c193e7574 100644
--- a/x11-fonts/gentium-plus/distinfo
+++ b/x11-fonts/gentium-plus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472289812
-SHA256 (GentiumPlus-5.000.zip) = 335911f17bd2de4e43742e1d0367cfeff19a90abf7ed604f100a42705042e154
-SIZE (GentiumPlus-5.000.zip) = 2025499
+TIMESTAMP = 1625090780
+SHA256 (GentiumPlus-6.000.zip) = bbbd52cacf07a15c487ae90e34b0c2b7504173d0b289924440652b750b750db2
+SIZE (GentiumPlus-6.000.zip) = 9717524