diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 3bc7cf8f5832..5bc4ee05c592 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hylafax
 PORTVERSION=	6.0.6
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/
 
@@ -15,7 +16,6 @@ LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit
 
 MAKE_JOBS_UNSAFE=	yes
-#NO_STAGE=	yes
 NEED_ROOT=	yes
 
 USE_GHOSTSCRIPT=yes
@@ -85,6 +85,8 @@ post-patch:
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's,-O hfaxd.conf,-O hfaxd.conf-dist,' \
 		${WRKSRC}/hfaxd/Makefile.in
+	${REINPLACE_CMD} -e 's,hosts.hfaxd,hosts.hfaxd-dist,' \
+		${WRKSRC}/etc/Makefile.in
 	${REINPLACE_CMD} -e 's,-O typerules,-O typerules-dist,' \
 		-e 's,-O pagesizes,-O pagesizes-dist -src pagesizes,' \
 		${WRKSRC}/libhylafax/Makefile.in
diff --git a/comms/hylafax/pkg-plist b/comms/hylafax/pkg-plist
index 5effa4f209cf..d92dec1c66e3 100644
--- a/comms/hylafax/pkg-plist
+++ b/comms/hylafax/pkg-plist
@@ -253,7 +253,9 @@ config/sierra
 etc/dpsprinter.ps
 etc/cover.templ
 etc/xferfaxlog
-etc/hosts.hfaxd
+@unexec if cmp -s %D/etc/hosts.hfaxd %D/etc/hosts.hfaxd-dist; then rm -f %D/etc/hosts.hfaxd; fi
+etc/hosts.hfaxd-dist
+@exec [ -f %B/hosts.hfaxd ] || cp %B/%f %B/hosts.hfaxd
 etc/dialrules
 etc/dialrules.sf-ba
 etc/dialrules.europe