diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 178524431376..9241ea59b6e0 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -1,77 +1,86 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	fontconfig
 DISTVERSION=	2.13.94
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://www.freedesktop.org/software/fontconfig/release/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	XML-based font configuration API for X Windows
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libexpat.so:textproc/expat2
 
 USES=		cpe gperf meson pkgconfig python:3.6+,build shebangfix tar:xz
 CPE_VENDOR=	fontconfig_project
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	conf.d/link_confs.py \
 		conf.d/write-35-lang-normalize-conf.py \
 		fc-case/fc-case.py \
 		fc-lang/fc-lang.py
 
 TEST_TARGET=	test
 
 # Custom configuration variables
 FCDEFAULTFONTS=	${PREFIX}/share/fonts
 FCADDFONTS=	${LOCALBASE}/lib/X11/fonts
 
-# To avoid circular depdency docs (including manpages) needs to be disabled as
-# they depend on textproc/docbook-utils which requires fontconfig
+# To avoid circular dependency rebuild of docs (including manpages) needs to be
+# disabled as they depend on textproc/docbook-utils which requires fontconfig
 MESON_ARGS=	-Ddefault_library=both -Ddoc=disabled
 
 PLIST_SUB=	PREFERRED_HINTING=${PREFERRED_HINTING}
+PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
 
-OPTIONS_DEFINE=	NLS BITMAPS TEST
+OPTIONS_DEFINE=	DOCS NLS BITMAPS TEST
 OPTIONS_DEFAULT=BITMAPS HINTING_SLIGHT
 OPTIONS_SUB=	yes
 
 OPTIONS_SINGLE=	HINTING
 .for opt in NONE SLIGHT MEDIUM FULL
 OPTIONS_SINGLE_HINTING+=	HINTING_${opt}
 HINTING_${opt}_DESC=	${opt:tl}
 HINTING_${opt}_VARS=	PREFERRED_HINTING=${opt:tl}
 .endfor
 
 BITMAPS_DESC=	Enable bitmap fonts by default
 HINTING_DESC=	Preferred pixel hinting configuration
 
 NLS_USES=		gettext-tools
 NLS_MESON_ENABLED=	nls
 
 TEST_MESON_ENABLED=	tests
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%FCDEFAULTFONTS%%|${FCDEFAULTFONTS}|g' \
 	    ${PATCH_WRKSRC}/meson.build
 	@${REINPLACE_CMD} -e 's|%%FCADDFONTS%%|${FCADDFONTS}|g' \
 	    ${PATCH_WRKSRC}/meson.build
 	@${REINPLACE_CMD} -e 's|%%FCPREFERREDHINTING%%|${PREFERRED_HINTING}|g' \
 	    ${PATCH_WRKSRC}/conf.d/meson.build
 
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5
 	${MV} ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/db/fontconfig
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
+
 post-install-BITMAPS-off:
 	${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-no-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf
 
 post-install-BITMAPS-on:
 	${RM} ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf
 	${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-yes-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-yes-bitmaps.conf
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 27e6889f2c20..58a09a8709fa 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -1,81 +1,309 @@
 bin/fc-cache
 bin/fc-cat
 bin/fc-conflist
 bin/fc-list
 bin/fc-match
 bin/fc-pattern
 bin/fc-query
 bin/fc-scan
 bin/fc-validate
 etc/fonts/conf.avail/05-reset-dirs-sample.conf
 etc/fonts/conf.avail/09-autohint-if-no-hinting.conf
 etc/fonts/conf.avail/10-autohint.conf
 etc/fonts/conf.avail/10-hinting-full.conf
 etc/fonts/conf.avail/10-hinting-medium.conf
 etc/fonts/conf.avail/10-hinting-none.conf
 etc/fonts/conf.avail/10-hinting-slight.conf
 etc/fonts/conf.avail/10-no-sub-pixel.conf
 etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
 etc/fonts/conf.avail/10-sub-pixel-bgr.conf
 etc/fonts/conf.avail/10-sub-pixel-rgb.conf
 etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
 etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
 etc/fonts/conf.avail/10-unhinted.conf
 etc/fonts/conf.avail/11-lcdfilter-default.conf
 etc/fonts/conf.avail/11-lcdfilter-legacy.conf
 etc/fonts/conf.avail/11-lcdfilter-light.conf
 etc/fonts/conf.avail/20-unhint-small-vera.conf
 etc/fonts/conf.avail/25-unhint-nonlatin.conf
 etc/fonts/conf.avail/30-metric-aliases.conf
 etc/fonts/conf.avail/35-lang-normalize.conf
 etc/fonts/conf.avail/40-nonlatin.conf
 etc/fonts/conf.avail/45-generic.conf
 etc/fonts/conf.avail/45-latin.conf
 etc/fonts/conf.avail/49-sansserif.conf
 etc/fonts/conf.avail/50-user.conf
 etc/fonts/conf.avail/51-local.conf
 etc/fonts/conf.avail/60-generic.conf
 etc/fonts/conf.avail/60-latin.conf
 etc/fonts/conf.avail/65-fonts-persian.conf
 etc/fonts/conf.avail/65-khmer.conf
 etc/fonts/conf.avail/65-nonlatin.conf
 etc/fonts/conf.avail/69-unifont.conf
 etc/fonts/conf.avail/70-no-bitmaps.conf
 etc/fonts/conf.avail/70-yes-bitmaps.conf
 etc/fonts/conf.avail/80-delicious.conf
 etc/fonts/conf.avail/90-synthetic.conf
 etc/fonts/conf.d/10-hinting-%%PREFERRED_HINTING%%.conf
 etc/fonts/conf.d/10-scale-bitmap-fonts.conf
 etc/fonts/conf.d/20-unhint-small-vera.conf
 etc/fonts/conf.d/30-metric-aliases.conf
 etc/fonts/conf.d/40-nonlatin.conf
 etc/fonts/conf.d/45-generic.conf
 etc/fonts/conf.d/45-latin.conf
 etc/fonts/conf.d/49-sansserif.conf
 etc/fonts/conf.d/50-user.conf
 etc/fonts/conf.d/51-local.conf
 etc/fonts/conf.d/60-generic.conf
 etc/fonts/conf.d/60-latin.conf
 etc/fonts/conf.d/65-fonts-persian.conf
 etc/fonts/conf.d/65-nonlatin.conf
 etc/fonts/conf.d/69-unifont.conf
 %%NO_BITMAPS%%etc/fonts/conf.d/70-no-bitmaps.conf
 %%BITMAPS%%etc/fonts/conf.d/70-yes-bitmaps.conf
 etc/fonts/conf.d/80-delicious.conf
 etc/fonts/conf.d/90-synthetic.conf
 etc/fonts/conf.d/README
 @sample etc/fonts/fonts.conf.sample
 etc/fonts/fonts.dtd
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
 include/fontconfig/fontconfig.h
 lib/libfontconfig.a
 lib/libfontconfig.so
 lib/libfontconfig.so.1
 lib/libfontconfig.so.1.12.0
 libdata/pkgconfig/fontconfig.pc
+man/man1/fc-cache.1.gz
+man/man1/fc-cat.1.gz
+man/man1/fc-conflist.1.gz
+man/man1/fc-list.1.gz
+man/man1/fc-match.1.gz
+man/man1/fc-pattern.1.gz
+man/man1/fc-query.1.gz
+man/man1/fc-scan.1.gz
+man/man1/fc-validate.1.gz
+man/man3/FcAtomicCreate.3.gz
+man/man3/FcAtomicDeleteNew.3.gz
+man/man3/FcAtomicDestroy.3.gz
+man/man3/FcAtomicLock.3.gz
+man/man3/FcAtomicNewFile.3.gz
+man/man3/FcAtomicOrigFile.3.gz
+man/man3/FcAtomicReplaceOrig.3.gz
+man/man3/FcAtomicUnlock.3.gz
+man/man3/FcBlanksAdd.3.gz
+man/man3/FcBlanksCreate.3.gz
+man/man3/FcBlanksDestroy.3.gz
+man/man3/FcBlanksIsMember.3.gz
+man/man3/FcCacheCopySet.3.gz
+man/man3/FcCacheCreateTagFile.3.gz
+man/man3/FcCacheDir.3.gz
+man/man3/FcCacheNumFont.3.gz
+man/man3/FcCacheNumSubdir.3.gz
+man/man3/FcCacheSubdir.3.gz
+man/man3/FcCharSetAddChar.3.gz
+man/man3/FcCharSetCopy.3.gz
+man/man3/FcCharSetCount.3.gz
+man/man3/FcCharSetCoverage.3.gz
+man/man3/FcCharSetCreate.3.gz
+man/man3/FcCharSetDelChar.3.gz
+man/man3/FcCharSetDestroy.3.gz
+man/man3/FcCharSetEqual.3.gz
+man/man3/FcCharSetFirstPage.3.gz
+man/man3/FcCharSetHasChar.3.gz
+man/man3/FcCharSetIntersect.3.gz
+man/man3/FcCharSetIntersectCount.3.gz
+man/man3/FcCharSetIsSubset.3.gz
+man/man3/FcCharSetMerge.3.gz
+man/man3/FcCharSetNew.3.gz
+man/man3/FcCharSetNextPage.3.gz
+man/man3/FcCharSetSubtract.3.gz
+man/man3/FcCharSetSubtractCount.3.gz
+man/man3/FcCharSetUnion.3.gz
+man/man3/FcConfigAppFontAddDir.3.gz
+man/man3/FcConfigAppFontAddFile.3.gz
+man/man3/FcConfigAppFontClear.3.gz
+man/man3/FcConfigBuildFonts.3.gz
+man/man3/FcConfigCreate.3.gz
+man/man3/FcConfigDestroy.3.gz
+man/man3/FcConfigEnableHome.3.gz
+man/man3/FcConfigFileInfoIterGet.3.gz
+man/man3/FcConfigFileInfoIterInit.3.gz
+man/man3/FcConfigFileInfoIterNext.3.gz
+man/man3/FcConfigFilename.3.gz
+man/man3/FcConfigGetBlanks.3.gz
+man/man3/FcConfigGetCache.3.gz
+man/man3/FcConfigGetCacheDirs.3.gz
+man/man3/FcConfigGetConfigDirs.3.gz
+man/man3/FcConfigGetConfigFiles.3.gz
+man/man3/FcConfigGetCurrent.3.gz
+man/man3/FcConfigGetFilename.3.gz
+man/man3/FcConfigGetFontDirs.3.gz
+man/man3/FcConfigGetFonts.3.gz
+man/man3/FcConfigGetRescanInterval.3.gz
+man/man3/FcConfigGetSysRoot.3.gz
+man/man3/FcConfigHome.3.gz
+man/man3/FcConfigParseAndLoad.3.gz
+man/man3/FcConfigParseAndLoadFromMemory.3.gz
+man/man3/FcConfigReference.3.gz
+man/man3/FcConfigSetCurrent.3.gz
+man/man3/FcConfigSetRescanInterval.3.gz
+man/man3/FcConfigSetSysRoot.3.gz
+man/man3/FcConfigSubstitute.3.gz
+man/man3/FcConfigSubstituteWithPat.3.gz
+man/man3/FcConfigUptoDate.3.gz
+man/man3/FcDefaultSubstitute.3.gz
+man/man3/FcDirCacheClean.3.gz
+man/man3/FcDirCacheCreateUUID.3.gz
+man/man3/FcDirCacheDeleteUUID.3.gz
+man/man3/FcDirCacheLoad.3.gz
+man/man3/FcDirCacheLoadFile.3.gz
+man/man3/FcDirCacheRead.3.gz
+man/man3/FcDirCacheRescan.3.gz
+man/man3/FcDirCacheUnlink.3.gz
+man/man3/FcDirCacheUnload.3.gz
+man/man3/FcDirCacheValid.3.gz
+man/man3/FcDirSave.3.gz
+man/man3/FcDirScan.3.gz
+man/man3/FcFileIsDir.3.gz
+man/man3/FcFileScan.3.gz
+man/man3/FcFini.3.gz
+man/man3/FcFontList.3.gz
+man/man3/FcFontMatch.3.gz
+man/man3/FcFontRenderPrepare.3.gz
+man/man3/FcFontSetAdd.3.gz
+man/man3/FcFontSetCreate.3.gz
+man/man3/FcFontSetDestroy.3.gz
+man/man3/FcFontSetList.3.gz
+man/man3/FcFontSetMatch.3.gz
+man/man3/FcFontSetPrint.3.gz
+man/man3/FcFontSetSort.3.gz
+man/man3/FcFontSetSortDestroy.3.gz
+man/man3/FcFontSort.3.gz
+man/man3/FcFreeTypeCharIndex.3.gz
+man/man3/FcFreeTypeCharSet.3.gz
+man/man3/FcFreeTypeCharSetAndSpacing.3.gz
+man/man3/FcFreeTypeQuery.3.gz
+man/man3/FcFreeTypeQueryAll.3.gz
+man/man3/FcFreeTypeQueryFace.3.gz
+man/man3/FcGetDefaultLangs.3.gz
+man/man3/FcGetLangs.3.gz
+man/man3/FcGetVersion.3.gz
+man/man3/FcInit.3.gz
+man/man3/FcInitBringUptoDate.3.gz
+man/man3/FcInitLoadConfig.3.gz
+man/man3/FcInitLoadConfigAndFonts.3.gz
+man/man3/FcInitReinitialize.3.gz
+man/man3/FcIsLower.3.gz
+man/man3/FcIsUpper.3.gz
+man/man3/FcLangGetCharSet.3.gz
+man/man3/FcLangNormalize.3.gz
+man/man3/FcLangSetAdd.3.gz
+man/man3/FcLangSetCompare.3.gz
+man/man3/FcLangSetContains.3.gz
+man/man3/FcLangSetCopy.3.gz
+man/man3/FcLangSetCreate.3.gz
+man/man3/FcLangSetDel.3.gz
+man/man3/FcLangSetDestroy.3.gz
+man/man3/FcLangSetEqual.3.gz
+man/man3/FcLangSetGetLangs.3.gz
+man/man3/FcLangSetHasLang.3.gz
+man/man3/FcLangSetHash.3.gz
+man/man3/FcLangSetSubtract.3.gz
+man/man3/FcLangSetUnion.3.gz
+man/man3/FcMatrixCopy.3.gz
+man/man3/FcMatrixEqual.3.gz
+man/man3/FcMatrixInit.3.gz
+man/man3/FcMatrixMultiply.3.gz
+man/man3/FcMatrixRotate.3.gz
+man/man3/FcMatrixScale.3.gz
+man/man3/FcMatrixShear.3.gz
+man/man3/FcNameConstant.3.gz
+man/man3/FcNameGetConstant.3.gz
+man/man3/FcNameGetObjectType.3.gz
+man/man3/FcNameParse.3.gz
+man/man3/FcNameRegisterConstants.3.gz
+man/man3/FcNameRegisterObjectTypes.3.gz
+man/man3/FcNameUnparse.3.gz
+man/man3/FcNameUnregisterConstants.3.gz
+man/man3/FcNameUnregisterObjectTypes.3.gz
+man/man3/FcObjectSetAdd.3.gz
+man/man3/FcObjectSetBuild.3.gz
+man/man3/FcObjectSetCreate.3.gz
+man/man3/FcObjectSetDestroy.3.gz
+man/man3/FcPatternAdd-Type.3.gz
+man/man3/FcPatternAdd.3.gz
+man/man3/FcPatternAddWeak.3.gz
+man/man3/FcPatternBuild.3.gz
+man/man3/FcPatternCreate.3.gz
+man/man3/FcPatternDel.3.gz
+man/man3/FcPatternDestroy.3.gz
+man/man3/FcPatternDuplicate.3.gz
+man/man3/FcPatternEqual.3.gz
+man/man3/FcPatternEqualSubset.3.gz
+man/man3/FcPatternFilter.3.gz
+man/man3/FcPatternFindIter.3.gz
+man/man3/FcPatternFormat.3.gz
+man/man3/FcPatternGet-Type.3.gz
+man/man3/FcPatternGet.3.gz
+man/man3/FcPatternGetWithBinding.3.gz
+man/man3/FcPatternHash.3.gz
+man/man3/FcPatternIterEqual.3.gz
+man/man3/FcPatternIterGetObject.3.gz
+man/man3/FcPatternIterGetValue.3.gz
+man/man3/FcPatternIterIsValid.3.gz
+man/man3/FcPatternIterNext.3.gz
+man/man3/FcPatternIterStart.3.gz
+man/man3/FcPatternIterValueCount.3.gz
+man/man3/FcPatternObjectCount.3.gz
+man/man3/FcPatternPrint.3.gz
+man/man3/FcPatternReference.3.gz
+man/man3/FcPatternRemove.3.gz
+man/man3/FcRangeCopy.3.gz
+man/man3/FcRangeCreateDouble.3.gz
+man/man3/FcRangeCreateInteger.3.gz
+man/man3/FcRangeDestroy.3.gz
+man/man3/FcRangeGetDouble.3.gz
+man/man3/FcStrBasename.3.gz
+man/man3/FcStrBuildFilename.3.gz
+man/man3/FcStrCmp.3.gz
+man/man3/FcStrCmpIgnoreCase.3.gz
+man/man3/FcStrCopy.3.gz
+man/man3/FcStrCopyFilename.3.gz
+man/man3/FcStrDirname.3.gz
+man/man3/FcStrDowncase.3.gz
+man/man3/FcStrFree.3.gz
+man/man3/FcStrListCreate.3.gz
+man/man3/FcStrListDone.3.gz
+man/man3/FcStrListFirst.3.gz
+man/man3/FcStrListNext.3.gz
+man/man3/FcStrPlus.3.gz
+man/man3/FcStrSetAdd.3.gz
+man/man3/FcStrSetAddFilename.3.gz
+man/man3/FcStrSetCreate.3.gz
+man/man3/FcStrSetDel.3.gz
+man/man3/FcStrSetDestroy.3.gz
+man/man3/FcStrSetEqual.3.gz
+man/man3/FcStrSetMember.3.gz
+man/man3/FcStrStr.3.gz
+man/man3/FcStrStrIgnoreCase.3.gz
+man/man3/FcToLower.3.gz
+man/man3/FcUcs4ToUtf8.3.gz
+man/man3/FcUtf16Len.3.gz
+man/man3/FcUtf16ToUcs4.3.gz
+man/man3/FcUtf8Len.3.gz
+man/man3/FcUtf8ToUcs4.3.gz
+man/man3/FcValueDestroy.3.gz
+man/man3/FcValueEqual.3.gz
+man/man3/FcValuePrint.3.gz
+man/man3/FcValueSave.3.gz
+man/man3/FcWeightFromOpenType.3.gz
+man/man3/FcWeightFromOpenTypeDouble.3.gz
+man/man3/FcWeightToOpenType.3.gz
+man/man3/FcWeightToOpenTypeDouble.3.gz
+man/man5/fonts-conf.5.gz
 share/gettext/its/fontconfig.its
 share/gettext/its/fontconfig.loc
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig.mo
 @dir /var/db/fontconfig