diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index 0e0ffd03ff9f..5db25aa6ac23 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -3,46 +3,40 @@
 
 PORTNAME=	efax-0.9a
 PORTVERSION=	001114a7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms
 MASTER_SITES=	http://shino.pos.to/linux/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fax send/receive program
 
-RUN_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage
+RUN_DEPENDS=xloadimage:${PORTSDIR}/x11/xloadimage
 
-USES=		gmake
-MAN1=		fax.1 \
-		efax.1 \
-		efix.1
 DOCSDIR=	${PREFIX}/share/doc/efax
 PORTDOCS=	COPYING README printcap.sample efax.html fax.html
 MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		INSTALL_DATA="${INSTALL_DATA}"
+			INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+			INSTALL_DATA="${INSTALL_DATA}"
+SUB_FILES=	pkg-message
 
 CONFLICTS=	efax-gtk-*
 
-NO_STAGE=	yes
+post-patch:
+	${REINPLACE_CMD} -e 's,$$(PREFIX),${STAGEDIR}&,g' ${WRKSRC}/Makefile
+
 post-build:
-	${MV} ${WRKSRC}/fax ${WRKSRC}/fax.orig
-	${CAT} ${WRKSRC}/fax.orig | ${SED} -e s!%%PREFIX%%!${PREFIX}!g > \
-		${WRKSRC}/fax
+	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/fax
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/efax.rc.sample ${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/efax.rc.sample.ja ${PREFIX}/etc
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
-	@${ECHO_CMD}
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${ECHO_CMD}
+	${INSTALL_DATA} ${WRKSRC}/efax.rc.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/efax.rc.sample.ja ${STAGEDIR}${PREFIX}/etc/efax.rc.ja.sample
+	@${MKDIR} ${STAGEDIR}/var/spool/fax/incoming
+	${TOUCH} ${STAGEDIR}/var/spool/fax/incoming/.keepme
+	@${MKDIR} ${STAGEDIR}/var/spool/fax/outgoing
+	${TOUCH} ${STAGEDIR}/var/spool/fax/outgoing/lock
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/comms/efax/files/patch-src:Makefile b/comms/efax/files/patch-src_Makefile
similarity index 100%
rename from comms/efax/files/patch-src:Makefile
rename to comms/efax/files/patch-src_Makefile
diff --git a/comms/efax/files/patch-src:fax b/comms/efax/files/patch-src_fax
similarity index 100%
rename from comms/efax/files/patch-src:fax
rename to comms/efax/files/patch-src_fax
diff --git a/comms/efax/files/pkg-message.in b/comms/efax/files/pkg-message.in
new file mode 100644
index 000000000000..39baf16af0ff
--- /dev/null
+++ b/comms/efax/files/pkg-message.in
@@ -0,0 +1,5 @@
+Edit %%PREFIX%%/etc/efax.rc (or replace it with
+%%PREFIX%%/etc/efax.rc.ja first) before using
+efax.
+
+You should at least modify DEV=, FROM=, and NAME=.
diff --git a/comms/efax/pkg-install b/comms/efax/pkg-install
deleted file mode 100644
index 193b9eb73c53..000000000000
--- a/comms/efax/pkg-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
-/bin/mkdir -p /var/spool/fax/incoming
-/usr/sbin/chown uucp:dialer /var/spool/fax/incoming
-/bin/mkdir -p /var/spool/fax/outgoing
-/usr/sbin/chown uucp:dialer /var/spool/fax/outgoing
-/usr/bin/touch /var/spool/fax/outgoing/lock
-/usr/sbin/chown uucp:dialer /var/spool/fax/outgoing/lock
-/bin/echo "Copy \${PREFIX}/etc/efax.rc.sample(.ja) to \${PREFIX}/etc/efax.rc"
-/bin/echo "and edit. At least you should modify DEV=, FROM=, and NAME="
diff --git a/comms/efax/pkg-plist b/comms/efax/pkg-plist
index 65ecdd515911..fa0100bb754e 100644
--- a/comms/efax/pkg-plist
+++ b/comms/efax/pkg-plist
@@ -1,11 +1,17 @@
 bin/fax
 bin/efax
 bin/efix
-etc/efax.rc.sample
-etc/efax.rc.sample.ja
-@cwd /
-var/spool/fax/outgoing/lock
-@dirrmtry var/spool/fax/incoming
-@dirrmtry var/spool/fax/outgoing
-@dirrmtry var/spool/fax
-@cwd
+@sample etc/efax.rc.sample
+@sample etc/efax.rc.ja.sample
+man/man1/fax.1.gz
+man/man1/efax.1.gz
+man/man1/efix.1.gz
+@owner uucp
+@group dialer
+/var/spool/fax/incoming/.keepme
+/var/spool/fax/outgoing/lock
+@dirrmtry /var/spool/fax/outgoing
+@dirrmtry /var/spool/fax/incoming
+@dirrmtry /var/spool/fax
+@group
+@owner