diff --git a/security/john/Makefile b/security/john/Makefile
index da391f8bc6c..eb06ecfb1f5 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.31 2005/09/07 19:43:41 aanriot Exp $
+# $OpenBSD: Makefile,v 1.32 2005/09/09 06:10:29 marcm Exp $
 
 COMMENT=		"extremely fast password cracker"
 
 DISTNAME=		john-1.6.38
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		security
 
 HOMEPAGE=		http://www.openwall.com/john/
@@ -69,6 +69,7 @@ do-install:
 		ln -sf john unafs && \
 		ln -sf john unique
 	${INSTALL_DATA} ${WRKDIST}/run/john.conf ${PREFIX}/share/examples/john
+	${INSTALL_DATA} ${WRKDIR}/john-1.6/doc/* ${PREFIX}/share/doc/john
 	${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
 	${INSTALL_DATA} ${WRKDIR}/john-1.6/run/*.chr ${PREFIX}/share/john
 
diff --git a/security/john/pkg/PLIST b/security/john/pkg/PLIST
index ccde5eec6f9..20a191567de 100644
--- a/security/john/pkg/PLIST
+++ b/security/john/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2005/09/06 20:20:26 aanriot Exp $
+@comment $OpenBSD: PLIST,v 1.9 2005/09/09 06:10:29 marcm Exp $
 bin/john
 bin/mailer
 bin/unafs
@@ -6,11 +6,18 @@ bin/unique
 bin/unshadow
 share/doc/john/
 share/doc/john/CHANGES
+share/doc/john/CONFIG
+@comment share/doc/john/CREDITS
+share/doc/john/EXAMPLES
+share/doc/john/EXTERNAL
+share/doc/john/FAQ
 share/doc/john/INSTALL
 share/doc/john/LICENSING
 share/doc/john/MODES
+@comment share/doc/john/NEWS
 share/doc/john/OPTIONS
 share/doc/john/README
+share/doc/john/RULES
 share/examples/john/
 share/examples/john/john.conf
 @sample ${SYSCONFDIR}/john.conf