diff --git a/x11-fonts/xorg-fonts-encodings/Makefile b/x11-fonts/xorg-fonts-encodings/Makefile
index 59de097112b4..1435519237f3 100644
--- a/x11-fonts/xorg-fonts-encodings/Makefile
+++ b/x11-fonts/xorg-fonts-encodings/Makefile
@@ -1,33 +1,34 @@
 # New ports collection makefile for:    xorg-fonts-encodings
 # Date created:		30 May 2004
 # Whom:			anholt@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xorg-fonts-encodings
 PORTVERSION=	6.9.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
 DISTNAME=	X11R${PORTVERSION}-src1
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org font encoding files
 
 BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/xorg-clients
 
 CONFLICTS=	XFree86-fontEncodings-*
 
 EXTRA_PATCHES=	${CF_PATCHES}
 
 XBUILD_DIRS=	fonts/encodings
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-encodings/pkg-plist b/x11-fonts/xorg-fonts-encodings/pkg-plist
index 89c3fd363270..4c0ff6dabef0 100644
--- a/x11-fonts/xorg-fonts-encodings/pkg-plist
+++ b/x11-fonts/xorg-fonts-encodings/pkg-plist
@@ -1,54 +1,60 @@
 lib/X11/fonts/encodings/adobe-dingbats.enc.gz
 lib/X11/fonts/encodings/adobe-standard.enc.gz
 lib/X11/fonts/encodings/adobe-symbol.enc.gz
 lib/X11/fonts/encodings/ansi-1251.enc.gz
 lib/X11/fonts/encodings/armscii-8.enc.gz
 lib/X11/fonts/encodings/ascii-0.enc.gz
 lib/X11/fonts/encodings/dec-special.enc.gz
 lib/X11/fonts/encodings/encodings.dir
 lib/X11/fonts/encodings/ibm-cp437.enc.gz
 lib/X11/fonts/encodings/ibm-cp850.enc.gz
 lib/X11/fonts/encodings/ibm-cp852.enc.gz
 lib/X11/fonts/encodings/ibm-cp866.enc.gz
 lib/X11/fonts/encodings/iso8859-11.enc.gz
 lib/X11/fonts/encodings/iso8859-13.enc.gz
 lib/X11/fonts/encodings/iso8859-16.enc.gz
 lib/X11/fonts/encodings/iso8859-6.16.enc.gz
 lib/X11/fonts/encodings/iso8859-6.8x.enc.gz
 lib/X11/fonts/encodings/large/big5.eten-0.enc.gz
 lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz
 lib/X11/fonts/encodings/large/cns11643-1.enc.gz
 lib/X11/fonts/encodings/large/cns11643-2.enc.gz
 lib/X11/fonts/encodings/large/cns11643-3.enc.gz
 lib/X11/fonts/encodings/large/encodings.dir
 lib/X11/fonts/encodings/large/gb18030-0.enc.gz
 lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz
 lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz
 lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz
 lib/X11/fonts/encodings/large/gbk-0.enc.gz
 lib/X11/fonts/encodings/large/jisx0201.1976-0.enc.gz
 lib/X11/fonts/encodings/large/jisx0208.1990-0.enc.gz
 lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz
 lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz
 lib/X11/fonts/encodings/large/ksc5601.1992-3.enc.gz
 lib/X11/fonts/encodings/large/sun.unicode.india-0.enc.gz
 lib/X11/fonts/encodings/microsoft-cp1250.enc.gz
 lib/X11/fonts/encodings/microsoft-cp1251.enc.gz
 lib/X11/fonts/encodings/microsoft-cp1252.enc.gz
 lib/X11/fonts/encodings/microsoft-cp1253.enc.gz
 lib/X11/fonts/encodings/microsoft-cp1254.enc.gz
 lib/X11/fonts/encodings/microsoft-cp1255.enc.gz
 lib/X11/fonts/encodings/microsoft-cp1256.enc.gz
 lib/X11/fonts/encodings/microsoft-cp1257.enc.gz
 lib/X11/fonts/encodings/microsoft-cp1258.enc.gz
 lib/X11/fonts/encodings/microsoft-win3.1.enc.gz
 lib/X11/fonts/encodings/mulearabic-0.enc.gz
 lib/X11/fonts/encodings/mulearabic-1.enc.gz
 lib/X11/fonts/encodings/mulearabic-2.enc.gz
 lib/X11/fonts/encodings/mulelao-1.enc.gz
 lib/X11/fonts/encodings/suneu-greek.enc.gz
 lib/X11/fonts/encodings/tcvn-0.enc.gz
 lib/X11/fonts/encodings/tis620-2.enc.gz
 lib/X11/fonts/encodings/viscii1.1-1.enc.gz
+@unexec rm %D/lib/X11/fonts/encodings/large/fonts.cache-1 2>/dev/null || true
+@unexec command fc-cache -v %D/lib/X11/fonts/encodings/large 2>/dev/null || true
+@unexec if [ -e %D/lib/X11/fonts/encodings/large/fonts.cache-1 -a ! -s %D/lib/X11/fonts/encodings/large/fonts.cache-1 ]; then rm %D/lib/X11/fonts/encodings/large/fonts.cache-1; fi
 @dirrmtry lib/X11/fonts/encodings/large
+@unexec rm %D/lib/X11/fonts/encodings/fonts.cache-1 2>/dev/null || true
+@unexec command fc-cache -v %D/lib/X11/fonts/encodings 2>/dev/null || true
+@unexec if [ -e %D/lib/X11/fonts/encodings/fonts.cache-1 -a ! -s %D/lib/X11/fonts/encodings/fonts.cache-1 ]; then rm %D/lib/X11/fonts/encodings/fonts.cache-1; fi
 @dirrmtry lib/X11/fonts/encodings