diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index e0c7d3e85e0d..42892c0bbdd9 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pgp
 PORTVERSION=	2.6.3i
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	PACKETSTORM/crypt/pgp/V5.0
 DISTNAME=	pgp263is
@@ -30,10 +30,8 @@ do-install:
 	-${MKDIR} ${PGPLIB}
 	cd ${WRKSRC}/.. && \
 		${INSTALL_DATA} pgp.hlp doc/pgpdoc1.txt doc/pgpdoc2.txt ${PGPLIB}/
-	${INSTALL_DATA} ${WRKSRC}/../language.txt ${PGPLIB}/language.txt-dist
-	${INSTALL_DATA} ${WRKSRC}/../config.txt ${PGPLIB}/config.txt-dist
-
-post-install:
+	${INSTALL_DATA} ${WRKSRC}/../language.txt ${PGPLIB}/language.txt.sample
+	${INSTALL_DATA} ${WRKSRC}/../config.txt ${PGPLIB}/config.txt.sample
 	${INSTALL_MAN} ${STAGEDIR}${PREFIX}/man/man1/pgp.1 ${STAGEDIR}${PREFIX}/man/man1/pgp2.1
 
 .include <bsd.port.mk>
diff --git a/security/pgp/pkg-plist b/security/pgp/pkg-plist
index 7000f9b047bc..f73994944cab 100644
--- a/security/pgp/pkg-plist
+++ b/security/pgp/pkg-plist
@@ -4,10 +4,5 @@ man/man1/pgp2.1.gz
 share/pgp/pgp.hlp
 share/pgp/pgpdoc1.txt
 share/pgp/pgpdoc2.txt
-@unexec if cmp -s %D/share/pgp/language.txt %D/share/pgp/language.txt-dist; then rm -f %D/share/pgp/language.txt; fi
-share/pgp/language.txt-dist
-@exec [ ! -f %B/language.txt ] && cp %B/%f %B/language.txt
-@unexec if cmp -s %D/share/pgp/config.txt %D/share/pgp/config.txt-dist; then rm -f %D/share/pgp/config.txt; fi
-share/pgp/config.txt-dist
-@exec [ ! -f %B/config.txt ] && cp %B/%f %B/config.txt
-@dirrm share/pgp
+@sample share/pgp/language.txt.sample
+@sample share/pgp/config.txt.sample