diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 33a71a89d5f..52c1094b5fb 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -4,7 +4,7 @@
 # Date created:		10 Nov 1997
 # Whom:			ejovi
 #
-# $OpenBSD: Makefile,v 1.3 1998/01/16 15:40:31 niklas Exp $
+# $OpenBSD: Makefile,v 1.4 1998/03/31 05:59:41 marc Exp $
 #
 
 DISTNAME=       pine3.96
@@ -12,18 +12,19 @@ PKGNAME=        pine-3.96
 CATEGORIES=     mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
-MAINTAINER=	joey@OpenBSD.ORG
-
-MAN1= 		pine.1 pico.1 pilot.1
+MAINTAINER=	ports@OpenBSD.ORG
 
 post-install:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} files/pgpencrypt ${PREFIX}/bin/pgpencrypt
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} files/pgpdecode ${PREFIX}/bin/pgpdecode
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} files/pgpsign ${PREFIX}/bin/pgpsign
-	install -c -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} files/dot.pinerc.pgp.sample ${PREFIX}/etc/dot.pinerc.pgp.sample
+	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		files/pgpencrypt ${PREFIX}/bin/pgpencrypt
+	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		files/pgpdecode ${PREFIX}/bin/pgpdecode
+	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+		files/pgpsign ${PREFIX}/bin/pgpsign
 	install -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \
 		${PREFIX}/share/doc/pine
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} doc/tech-notes.txt ${PREFIX}/share/doc/pine
+	cd ${WRKSRC} && ${INSTALL_DATA} \
+		doc/tech-notes.txt ${FILESDIR}/dot.pinerc.pgp.sample \
+		${PREFIX}/share/doc/pine
 
 .include <bsd.port.mk>
diff --git a/mail/pine/pkg/PLIST b/mail/pine/pkg/PLIST
index 9b0d8df34d3..49f25d56e46 100644
--- a/mail/pine/pkg/PLIST
+++ b/mail/pine/pkg/PLIST
@@ -4,9 +4,10 @@ bin/pine
 bin/pgpencrypt
 bin/pgpdecode
 bin/pgpsign
-etc/dot.pinerc.pgp.sample
 man/man1/pico.1
 man/man1/pilot.1
 man/man1/pine.1
+@exec mkdir -p %D/share/doc/pine
 share/doc/pine/tech-notes.txt
+share/doc/pine/dot.pinerc.pgp.sample
 @dirrm share/doc/pine