diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index 72574a7..94c5766 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	backuppc
 PORTVERSION=	3.3.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}
@@ -127,6 +127,8 @@ do-install:
 		${WRKSRC}/doc/BackupPC.pod ${WRKSRC}/${PORTNAME}.1
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	${RM} ${STAGEDIR}${ETCDIR}/config.pl
+	${RM} ${STAGEDIR}${ETCDIR}/hosts
 	${CP} ${WRKSRC}/conf/config.pl ${STAGEDIR}${ETCDIR}/config.pl.sample
 	${CP} ${WRKSRC}/conf/hosts ${STAGEDIR}${ETCDIR}/hosts.sample
 	${CP} ${WRKDIR}/update.sh ${STAGEDIR}${ETCDIR}/update.sh
diff --git a/sysutils/backuppc/pkg-plist b/sysutils/backuppc/pkg-plist
index 0624037..1a77022 100644
--- a/sysutils/backuppc/pkg-plist
+++ b/sysutils/backuppc/pkg-plist
@@ -76,7 +76,9 @@ lib/BackupPC/Zip/FileMember.pm
 lib/Net/FTP/AutoReconnect.pm
 lib/Net/FTP/RetrHandle.pm
 man/man1/backuppc.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/BackupPC.html
+@comment Main html doc should be unconditionally installed.
+@comment CGI uses the BackupPC.html as a documentation page.
+%%DOCSDIR%%/BackupPC.html
 %%PORTDOCS%%%%DOCSDIR%%/BackupPC.pod
 %%WWWDIR%%/0000000.gif
 %%WWWDIR%%/0000011.gif
@@ -139,6 +141,8 @@ man/man1/backuppc.1.gz
 @dirrm lib/BackupPC
 @dirrm lib/Net/FTP
 @dirrm lib/Net
+@comment Main html doc should be unconditionally installed.
+@dirrm %%DOCSDIR%%
 @dirrmtry %%WWWDIR%%
 @dirrmtry %%CGIDIR%%
 @exec install -d -o backuppc -g backuppc -m 0750 /var/log/BackupPC
@@ -156,10 +160,12 @@ man/man1/backuppc.1.gz
 @owner backuppc
 @group backuppc
 @dirrmtry %%ETCDIR%%
+@comment .sample files actually are templates for the configuration script
+@comment and should not be installed as working configuration files.
 @mode 0640
-@sample %%ETCDIR%%/config.pl.sample
+%%ETCDIR%%/config.pl.sample
 @mode 0644
-@sample %%ETCDIR%%/hosts.sample
+%%ETCDIR%%/hosts.sample
 @owner
 @group
 @mode 0544