diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index de1419eddd92..13e8d2dd3aed 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -1,35 +1,36 @@
 # New ports collection makefile for:	xfs
 # Date Created:				17 Feb 2006
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xfs
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org font server
 
 XORG_CAT=	app
 USE_XORG=	libfs xfont xtrans
 USE_RC_SUBR=	xfs
 ALL_TARGET=	all config
 
 MAN1=		xfs.1
 
 post-patch:
 	${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/Makefile.in
 .if defined(WITHOUT_XFS_CACHE)
 	${REINPLACE_CMD} -e 's|^cache|XCOMM &|' ${WRKSRC}/config.cpp
 .endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config.default
 	@if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \
 		${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfs/files/xfs.in b/x11-fonts/xfs/files/xfs.in
index cfb562fed5e3..1b3c4e24858d 100644
--- a/x11-fonts/xfs/files/xfs.in
+++ b/x11-fonts/xfs/files/xfs.in
@@ -1,37 +1,37 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: xfs
 # REQUIRE: cleartmp ldconfig
 # BEFORE:  LOGIN
 
 # The following variables are provided to control startup of X font server in
 # rc configuration file (eg /etc/rc.conf):
 # xfs_enable (bool):	Set to "NO" by default.
 #			Set it to "YES" to enable X font server
-# xfs_config (str):	Set to "%%PREFIX%%/lib/X11/fs/config" by default.
+# xfs_config (str):	Set to "%%PREFIX%%/etc/X11/fs/config" by default.
 #			Configuration file for X font server.
 #
 # Please see xfs(1), rc.conf(5) and rc(8) for further details.
 
 . %%RC_SUBR%%
 
 name="xfs"
 rcvar=`set_rcvar`
 
 # Set defaults
 [ -z "$xfs_enable" ] && xfs_enable="NO"
-[ -z "$xfs_config" ] && xfs_config="%%PREFIX%%/lib/X11/fs/config"
+[ -z "$xfs_config" ] && xfs_config="%%PREFIX%%/etc/X11/fs/config"
 
 load_rc_config $name
 
 command="%%PREFIX%%/bin/${name}"
 command_args="-config ${xfs_config} -daemon ${xfs_user:+-user ${xfs_user}}"
 required_files="$xfs_config"
 extra_commands="reload"
 
 unset xfs_user
 
 run_rc_command "$1"