diff --git a/sysutils/mapchan/Makefile b/sysutils/mapchan/Makefile
index c7eb83d48ee7..13c01d7d6de8 100644
--- a/sysutils/mapchan/Makefile
+++ b/sysutils/mapchan/Makefile
@@ -1,35 +1,42 @@
 # Created by: Konstantin Reznichenko <kot@premierbank.dp.ua>
 
 PORTNAME=	mapchan
 PORTVERSION=	3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils converters
 MASTER_SITES=	SF
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Transform the input and output of a terminal (SCO Unix alike)
 
 LICENSE=	GPLv2
 
 USES=		iconv tar:tgz
-WRKSRC=		${WRKDIR}/${PORTNAME}
-MAKE_ENV=	STAGEDIR=${STAGEDIR} MAPDIR=${STAGEDIR}${PREFIX}/etc/${PORTNAME}
+
+MAKE_ENV=	MAPDIR=${STAGEDIR}${PREFIX}/etc/${PORTNAME} \
+		STAGEDIR=${STAGEDIR}
+
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${CP} ${WRKSRC}/doc/mapchan.F ${WRKSRC}/doc/mapchan.8
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/mapchan.8 ${STAGEDIR}${MANPREFIX}/man/man8
-
 post-patch:
 	@${MV} ${WRKSRC}/examples/default ${WRKSRC}/examples/default.sample
 	@${RM} ${WRKSRC}/examples/default.orig
 	${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" ${WRKSRC}/mapchan.c
 	${REINPLACE_CMD} -e "s|utmp.h|utmpx.h|" ${WRKSRC}/mapchan.c
 
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/mapchan.8 ${STAGEDIR}${MANPREFIX}/man/man8
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/sysutils/mapchan/pkg-plist b/sysutils/mapchan/pkg-plist
index e7b5b779df18..8393db0c8632 100644
--- a/sysutils/mapchan/pkg-plist
+++ b/sysutils/mapchan/pkg-plist
@@ -1,16 +1,15 @@
 bin/mapchan
-etc/mapchan/altkoi.map
-@unexec if cmp -s %D/etc/mapchan/default %D/etc/mapchan/default.sample; then rm -f %D/etc/mapchan/default; fi
-etc/mapchan/default.sample
-etc/mapchan/dos2koi-kbd.map
-etc/mapchan/dos2koi.map
-etc/mapchan/k180.map
-etc/mapchan/koi2win.map
-etc/mapchan/koiualt.map
-etc/mapchan/koiumain.map
-etc/mapchan/msm.map
-etc/mapchan/sm7238.map
-etc/mapchan/trivial.map
-etc/mapchan/win2koi.map
+%%ETCDIR%%/altkoi.map
+@sample %%ETCDIR%%/default.sample
+%%ETCDIR%%/dos2koi-kbd.map
+%%ETCDIR%%/dos2koi.map
+%%ETCDIR%%/k180.map
+%%ETCDIR%%/koi2win.map
+%%ETCDIR%%/koiualt.map
+%%ETCDIR%%/koiumain.map
+%%ETCDIR%%/msm.map
+%%ETCDIR%%/sm7238.map
+%%ETCDIR%%/trivial.map
+%%ETCDIR%%/win2koi.map
 man/man8/mapchan.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/README