diff --git a/security/paperkey/Makefile b/security/paperkey/Makefile
index ae22be910b04..862eac9822a6 100644
--- a/security/paperkey/Makefile
+++ b/security/paperkey/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	paperkey
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.jabberwocky.com/software/paperkey/
 
@@ -16,12 +16,14 @@ COMMENT=	Extract just the secret information out of OpenPGP secret keys
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all check
 
+PLIST_FILES=	bin/paperkey
 MAN1=		paperkey.1
+PORTDOCS=	NEWS README
 
 .if !defined(NOPORTDOCS)
 post-install:
 		${MKDIR} ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/README ${DOCSDIR}
+		${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/paperkey/distinfo b/security/paperkey/distinfo
index 1949248e4c8c..d7d1fd6ba4ea 100644
--- a/security/paperkey/distinfo
+++ b/security/paperkey/distinfo
@@ -1,3 +1,3 @@
-MD5 (paperkey-1.1.tar.gz) = 06e5a01f96d40936624bdd8f49b22109
-SHA256 (paperkey-1.1.tar.gz) = 485241f0a3f18f5eadb1fd5706d9ff0f8456ac164ee3f9172ab8db8e310740a2
-SIZE (paperkey-1.1.tar.gz) = 197884
+MD5 (paperkey-1.2.tar.gz) = 84af99e3f283337722336571c630da93
+SHA256 (paperkey-1.2.tar.gz) = c74358e7b35f7df21642181cf211c8438a1844a9d828080b2275450a73cae578
+SIZE (paperkey-1.2.tar.gz) = 219324
diff --git a/security/paperkey/pkg-plist b/security/paperkey/pkg-plist
deleted file mode 100644
index 0204e355a43d..000000000000
--- a/security/paperkey/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/paperkey
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%