diff --git a/french/xtel/Makefile b/french/xtel/Makefile
index d22f52e358c4..2ed6c888ae1e 100644
--- a/french/xtel/Makefile
+++ b/french/xtel/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	2
 CATEGORIES=	french comms emulators
 MASTER_SITES=	http://pficheux.free.fr/xtel/download/
 
-MAINTAINER=	thierry@pompo.net
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	An emulator for the french Minitel
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -28,6 +28,8 @@ USE_REINPLACE=	yes
 
 MAN1=	xtel.1 xteld.1
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 .include <bsd.port.pre.mk>
 
 .if defined(LANG)
@@ -64,19 +66,19 @@ post-install:
 .endfor
 	@${ECHO}
 	@(if [ 0${LANGUE} = 0fr ] ; then \
-	  ${ECHO_MSG} "La documentation a été installée dans ${DOCSDIR}." ; \
+	  ${ECHO_MSG} "===> La documentation a été installée dans ${DOCSDIR}." ; \
 	else \
-	  ${ECHO_MSG} "Documentation installed in ${DOCSDIR}." ; \
+	  ${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." ; \
 	fi)
 .endif
 	@${TOUCH} ${PREFIX}/lib/X11/xtel/xtel.log
 	@(if [ 0${LANGUE} = 0fr ] ; then \
-		${CP} ${PKGMESSAGE}-fr ${WRKDIR}/pkg-message ; \
+		${CP} ${FILESDIR}/pkg-message-fr.in ${PKGMESSAGE} ; \
 	else \
-		${CP} ${PKGMESSAGE} ${WRKDIR} ; \
+		${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} ; \
 	fi)
 	@${ECHO}
-	@${CAT} ${WRKDIR}/pkg-message | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g"
+	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${PKGMESSAGE}
 	@${ECHO}
 
 .include <bsd.port.post.mk>
diff --git a/french/xtel/pkg-message-fr b/french/xtel/files/pkg-message-fr.in
similarity index 100%
rename from french/xtel/pkg-message-fr
rename to french/xtel/files/pkg-message-fr.in
diff --git a/french/xtel/pkg-message b/french/xtel/files/pkg-message.in
similarity index 100%
rename from french/xtel/pkg-message
rename to french/xtel/files/pkg-message.in
diff --git a/french/xtel/pkg-plist b/french/xtel/pkg-plist
index fb7fa49e79b9..fb077c7abb60 100644
--- a/french/xtel/pkg-plist
+++ b/french/xtel/pkg-plist
@@ -1,15 +1,13 @@
+bin/make_xtel_lignes
+bin/mdmdetect
 bin/xtel
 bin/xteld
-bin/mdmdetect
-bin/make_xtel_lignes
 lib/X11/app-defaults/XTel
 lib/X11/app-defaults/XTel-msg
-lib/X11/xtel/modem.list
-lib/X11/xtel/xtel.lignes
-lib/X11/xtel/xtel.log
-lib/X11/xtel/xtel.services
 lib/X11/fonts/xtel/fonts.alias
+@unexec rm %D/lib/X11/fonts/xtel/fonts.cache-1 2>/dev/null || true
 lib/X11/fonts/xtel/fonts.dir
+lib/X11/fonts/xtel/fonts.scale
 lib/X11/fonts/xtel/g016x10.pcf.gz
 lib/X11/fonts/xtel/g016x20.pcf.gz
 lib/X11/fonts/xtel/g016x40.pcf.gz
@@ -29,6 +27,10 @@ lib/X11/fonts/xtel/g18x10.pcf.gz
 lib/X11/fonts/xtel/g1s16x20.pcf.gz
 lib/X11/fonts/xtel/g1s8x10.pcf.gz
 lib/X11/fonts/xtel/xteldigit.pcf.gz
+lib/X11/xtel/modem.list
+lib/X11/xtel/xtel.lignes
+lib/X11/xtel/xtel.log
+lib/X11/xtel/xtel.services
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.txt