diff --git a/mail/cucipop/pkg/DEINSTALL b/mail/cucipop/pkg/DEINSTALL
new file mode 100644
index 00000000000..e4728b0a4bb
--- /dev/null
+++ b/mail/cucipop/pkg/DEINSTALL
@@ -0,0 +1,24 @@
+# $OpenBSD: DEINSTALL,v 1.1 1999/04/08 23:13:53 marc Exp $
+#
+# xtnpd de-installation
+
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+SPOOL_DIR=/var/spool/cucipop
+
+if [ -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/PLIST b/mail/cucipop/pkg/PLIST
index 79406a4ee9d..619af82767e 100644
--- a/mail/cucipop/pkg/PLIST
+++ b/mail/cucipop/pkg/PLIST
@@ -2,3 +2,5 @@ libexec/cucipop
 libexec/makevpopdb
 man/man8/cucipop.8
 man/man8/makevpopdb.8
+@exec mkdir -p /var/spool/cucipop
+@exec mkdir -p /var/spool/cucipop/bulletins