diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 3cbd7cdd2b9..ab74e880972 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,12 +1,25 @@
-# $OpenBSD: Makefile,v 1.18 2000/07/10 22:54:33 brad Exp $
+# $OpenBSD: Makefile,v 1.19 2000/09/03 17:20:33 espie Exp $
 
-DISTNAME=	pine4.21
-PKGNAME=	pine-4.21
-CATEGORIES=	mail news
-NEED_VERSION=	1.310
+MULTI_PACKAGES=-pine -pico
+SUBPACKAGE?=
+
+VERSION=4.21
+DISTNAME=	pine${VERSION}
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.sunet.se/pub/unix/mail/pine/
 
+.if ${SUBPACKAGE} == "-pine"
+PKGNAME=	pine-${VERSION}
+CATEGORIES=	mail news
+.elif ${SUBPACKAGE} == "-pico"
+PKGNAME=	pico-${VERSION}
+CATEGORIES=	editors
+.else
+PKGNAME=	pine+pico-${VERSION}
+CATEGORIES=	mail news editors
+.endif
+NEED_VERSION=	1.310
+
 HOMEPAGE=	http://www.washington.edu/pine/
 
 MAINTAINER=	ports@openbsd.org
diff --git a/mail/pine/pkg/COMMENT b/mail/pine/pkg/COMMENT
index a6b5ae32878..d09ef8e993c 100644
--- a/mail/pine/pkg/COMMENT
+++ b/mail/pine/pkg/COMMENT
@@ -1 +1 @@
-Program for Internet E-mail and News
+Program for Internet E-mail and News, plus editor
diff --git a/mail/pine/pkg/COMMENT-pico b/mail/pine/pkg/COMMENT-pico
new file mode 100644
index 00000000000..b9176c3b73a
--- /dev/null
+++ b/mail/pine/pkg/COMMENT-pico
@@ -0,0 +1 @@
+small text editor
diff --git a/mail/pine/pkg/COMMENT-pine b/mail/pine/pkg/COMMENT-pine
new file mode 100644
index 00000000000..f28337f40a8
--- /dev/null
+++ b/mail/pine/pkg/COMMENT-pine
@@ -0,0 +1 @@
+Program for Internet E-mail and News, without editor
diff --git a/mail/pine/pkg/DESCR b/mail/pine/pkg/DESCR
index ad4b3cbd1c3..f1517ae14e0 100644
--- a/mail/pine/pkg/DESCR
+++ b/mail/pine/pkg/DESCR
@@ -6,8 +6,9 @@ RFC-822, SMTP, MIME, IMAP, NNTP) and runs on Unix and PCs.  This
 package also includes the Pico editor, the IMAP daemon, a POP2 server, 
 and a POP3 server.
 
-If you want to use the spell checking feature of pine, set the
-environment variable SPELL to "/usr/local/bin/ispell -l".
+If you want to use the spell checking feature of pine, install ispell
+and set the environment variable SPELL to 
+"${PREFIX}/ispell -l".
 
 An optional configuration file "pine.conf" can be put into /etc 
 to set system wide defaults.  The format of this file is identical to the 
diff --git a/mail/pine/pkg/DESCR-pico b/mail/pine/pkg/DESCR-pico
new file mode 100644
index 00000000000..ad4b3cbd1c3
--- /dev/null
+++ b/mail/pine/pkg/DESCR-pico
@@ -0,0 +1,20 @@
+Pine is a tool for reading, sending, and managing
+electronic messages.  It was designed specifically with novice
+computer users in mind, but can be tailored to accommodate the needs
+of "power users" as well.  Pine uses Internet message protocols (e.g.
+RFC-822, SMTP, MIME, IMAP, NNTP) and runs on Unix and PCs.  This
+package also includes the Pico editor, the IMAP daemon, a POP2 server, 
+and a POP3 server.
+
+If you want to use the spell checking feature of pine, set the
+environment variable SPELL to "/usr/local/bin/ispell -l".
+
+An optional configuration file "pine.conf" can be put into /etc 
+to set system wide defaults.  The format of this file is identical to the 
+.pinerc file that is auto-generated by pine in your home directory.
+
+Also included in dot.pinerc.pgp.sample are example entries needed to
+add to your .pinerc to activate the pgp add on scripts pgpdecode,
+pgpencode, and pgpsign.
+
+WWW: ${HOMEPAGE}
diff --git a/mail/pine/pkg/DESCR-pine b/mail/pine/pkg/DESCR-pine
new file mode 100644
index 00000000000..323abd86b89
--- /dev/null
+++ b/mail/pine/pkg/DESCR-pine
@@ -0,0 +1,21 @@
+Pine is a tool for reading, sending, and managing
+electronic messages.  It was designed specifically with novice
+computer users in mind, but can be tailored to accommodate the needs
+of "power users" as well.  Pine uses Internet message protocols (e.g.
+RFC-822, SMTP, MIME, IMAP, NNTP) and runs on Unix and PCs.  This
+package also includes the IMAP daemon, a POP2 server, 
+and a POP3 server, but not the pico editor.
+
+If you want to use the spell checking feature of pine, install ispell
+and set the environment variable SPELL to 
+"${PREFIX}/ispell -l".
+
+An optional configuration file "pine.conf" can be put into /etc 
+to set system wide defaults.  The format of this file is identical to the 
+.pinerc file that is auto-generated by pine in your home directory.
+
+Also included in dot.pinerc.pgp.sample are example entries needed to
+add to your .pinerc to activate the pgp add on scripts pgpdecode,
+pgpencode, and pgpsign.
+
+WWW: ${HOMEPAGE}
diff --git a/mail/pine/pkg/INSTALL b/mail/pine/pkg/INSTALL
deleted file mode 100644
index 8b07943bd37..00000000000
--- a/mail/pine/pkg/INSTALL
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.3 2000/08/04 18:30:39 brad Exp $
-#
-# Pre/post-installation setup of pine
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-# Function: tell the user what s/he needs to do to use the port just installed
-#
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| Some documentation for $1 can be found in"
-    echo "| $PREFIX/share/doc/pine as well as pine(1)."
-    echo "|"
-    echo "| Please read the documentation for instruction on how to make/update"
-    echo "| the configuration files /etc/pine.conf and /etc/pine.conf.fixed"
-    echo "+---------------"
-    echo
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	do_notice $1
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/mail/pine/pkg/MESSAGE b/mail/pine/pkg/MESSAGE
new file mode 100644
index 00000000000..1b1ed8f7025
--- /dev/null
+++ b/mail/pine/pkg/MESSAGE
@@ -0,0 +1,7 @@
++---------------
+| Some documentation for pine can be found in
+| ${PREFIX}/share/doc/pine as well as pine(1).
+|
+| Please read the documentation for instruction on how to make/update
+| the configuration files /etc/pine.conf and /etc/pine.conf.fixed
++---------------
diff --git a/mail/pine/pkg/MESSAGE-pine b/mail/pine/pkg/MESSAGE-pine
new file mode 100644
index 00000000000..1b1ed8f7025
--- /dev/null
+++ b/mail/pine/pkg/MESSAGE-pine
@@ -0,0 +1,7 @@
++---------------
+| Some documentation for pine can be found in
+| ${PREFIX}/share/doc/pine as well as pine(1).
+|
+| Please read the documentation for instruction on how to make/update
+| the configuration files /etc/pine.conf and /etc/pine.conf.fixed
++---------------
diff --git a/mail/pine/pkg/PLIST b/mail/pine/pkg/PLIST
index 45538d69fa8..88e0f4ceda6 100644
--- a/mail/pine/pkg/PLIST
+++ b/mail/pine/pkg/PLIST
@@ -1,3 +1,6 @@
+@comment $OpenBSD: PLIST,v 1.9 2000/09/03 17:20:34 espie Exp $
+@pkgcfl pine-*
+@pkgcfl pico-*
 bin/pico
 bin/pilot
 bin/pine
diff --git a/mail/pine/pkg/PLIST-pico b/mail/pine/pkg/PLIST-pico
new file mode 100644
index 00000000000..03fa9938dc5
--- /dev/null
+++ b/mail/pine/pkg/PLIST-pico
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST-pico,v 1.1 2000/09/03 17:20:34 espie Exp $
+@pkgcfl pine+pico-*
+bin/pico
+man/man1/pico.1
diff --git a/mail/pine/pkg/PLIST-pine b/mail/pine/pkg/PLIST-pine
new file mode 100644
index 00000000000..b33db89ce6d
--- /dev/null
+++ b/mail/pine/pkg/PLIST-pine
@@ -0,0 +1,12 @@
+@comment $OpenBSD: PLIST-pine,v 1.1 2000/09/03 17:20:34 espie Exp $
+@pkgcfl pine+pico-*
+bin/pilot
+bin/pine
+bin/pgpencrypt
+bin/pgpdecode
+bin/pgpsign
+man/man1/pilot.1
+man/man1/pine.1
+share/doc/pine/tech-notes.txt
+share/doc/pine/dot.pinerc.pgp.sample
+@dirrm share/doc/pine