diff --git a/x11-fonts/andika/Makefile b/x11-fonts/andika/Makefile
index 1e1f710c83ec..f168b064906f 100644
--- a/x11-fonts/andika/Makefile
+++ b/x11-fonts/andika/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	Andika
-DISTVERSION=	5.000
-PORTREVISION=	3
+DISTVERSION=	6.000
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://software.sil.org/downloads/r/andika/
 
 MAINTAINER=	0mp@FreeBSD.org
-COMMENT=	Andika TrueType fonts
+COMMENT=	Sans-serif font designed for literacy use
 
 LICENSE=	OFL11
 LICENSE_FILE=	${WRKSRC}/OFL.txt
 
 USES=		fonts zip
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	${FONTSDIR}/Andika-R.ttf
-
 SUB_FILES=	pkg-message
 
-DOCSLIST=	FONTLOG.txt OFL-FAQ.txt README.txt documentation/Andika-features.odt documentation/Andika-features.pdf documentation/DOCUMENTATION.txt
-PORTDOCS=	${DOCSLIST:C,^.*/,,}
-
 OPTIONS_DEFINE=	DOCS
 
+_DOCSLIST=	FONTLOG.txt OFL-FAQ.txt README.txt
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOCSLIST:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/documentation
+	(cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/documentation)
+	${RM} -r ${STAGEDIR}${DOCSDIR}/documentation/source
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCSLIST} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/andika/distinfo b/x11-fonts/andika/distinfo
index bfccbeb5499f..2f37e636ed8a 100644
--- a/x11-fonts/andika/distinfo
+++ b/x11-fonts/andika/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571834957
-SHA256 (Andika-5.000.zip) = 604b7a1194be099bdf311ef76cbce086a054fa16d2b101cfaedcf527c63df507
-SIZE (Andika-5.000.zip) = 1246559
+TIMESTAMP = 1625047193
+SHA256 (Andika-6.000.zip) = 71e307871125f51ef5e189056debffe3745be3b5c51937a834af6e42cc499d28
+SIZE (Andika-6.000.zip) = 4252133
diff --git a/x11-fonts/andika/pkg-descr b/x11-fonts/andika/pkg-descr
index 6634440d09cb..1520030a0809 100644
--- a/x11-fonts/andika/pkg-descr
+++ b/x11-fonts/andika/pkg-descr
@@ -1,4 +1,6 @@
-A font family designed especially for literacy use, taking into account the
-needs of beginning readers.
+Andika is a sans-serif font family designed and optimized especially for
+literacy use. It supports almost the complete range of Unicode characters for
+these scripts, including a comprehensive range of diacritics and a large set of
+symbols useful for linguistics and literacy work.
 
 WWW: https://software.sil.org/andika/