diff --git a/mail/cucipop/pkg/DEINSTALL b/mail/cucipop/pkg/DEINSTALL
deleted file mode 100644
index 7ab0497ab3b..00000000000
--- a/mail/cucipop/pkg/DEINSTALL
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.4 2004/04/14 14:24:34 xsa Exp $
-#
-# cucipop de-installation
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-SPOOL_DIR=/var/spool/cucipop
-
-if [ ${PKG_DELETE_EXTRA} != Yes -a -d $SPOOL_DIR ]; then
-    echo
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| this step as root:"
-    echo "|"
-    echo "|           rm -rf $SPOOL_DIR"
-    echo "|"
-    echo "| Do not do this if you plan on re-installing $1"
-    echo "| at some future time."
-    echo "+---------------"
-    echo
-fi
-
-exit 0
diff --git a/mail/cucipop/pkg/INSTALL b/mail/cucipop/pkg/INSTALL
deleted file mode 100644
index 5423e92ebd8..00000000000
--- a/mail/cucipop/pkg/INSTALL
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 2001/02/23 00:15:35 brad Exp $
-#
-# Pre/post-installation setup of cucipop
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-SPOOL_DIR=/var/spool/cucipop
-
-# Function: install the cucipop spool dir
-#
-do_install()
-{
-    install -d -o root -g wheel -m 755 $SPOOL_DIR
-    install -d -o root -g wheel -m 755 $SPOOL_DIR/bulletins
-}
-
-# 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_install
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/mail/cucipop/pkg/PLIST b/mail/cucipop/pkg/PLIST
index 8a6d0b40af3..b2b51dfedee 100644
--- a/mail/cucipop/pkg/PLIST
+++ b/mail/cucipop/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.7 2004/09/15 09:09:41 espie Exp $
+@comment $OpenBSD: PLIST,v 1.8 2004/09/22 22:53:07 espie Exp $
 libexec/cucipop
 libexec/makevpopdb
 @man man/man8/cucipop.8
 @man man/man8/makevpopdb.8
+@sample /var/spool/cucipop/
+@sample /var/spool/cucipop/bulletins/
 @extraunexec rm -rf /var/spool/cucipop