diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 8364f570f47..83e2c8d72e8 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2004/07/26 10:18:25 peter Exp $ 
+# $OpenBSD: Makefile,v 1.42 2004/11/25 11:44:03 alek Exp $ 
 
 COMMENT=	"imap server for maildir format mailboxes"
 COMMENT-pop3=	"pop3 server for maildir format mailboxes"
@@ -10,7 +10,7 @@ MAINTAINER=	David Gwynne <loki@animata.net>
 
 COURIERVER=	3.0.5
 DISTNAME=	courier-imap-${COURIERVER}
-FULLPKGNAME=	courier-imap-${COURIERVER}
+FULLPKGNAME=	courier-imap-${COURIERVER}p0
 FULLPKGNAME-pop3= courier-pop3-${COURIERVER}
 FULLPKGNAME-ldap= courier-ldap-${COURIERVER}
 FULLPKGNAME-mysql= courier-mysql-${COURIERVER}
diff --git a/mail/courier-imap/pkg/INSTALL b/mail/courier-imap/pkg/INSTALL
deleted file mode 100644
index 38d5d81ee14..00000000000
--- a/mail/courier-imap/pkg/INSTALL
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: INSTALL,v 1.4 2003/02/17 16:14:34 avsm Exp $
-#
-# courier-imap installation to detect old-format config files
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-COURIERCONF=${SYSCONFDIR}/courier-imap
-
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| As of Courier-IMAP 1.3.0, configuration files have"
-    echo "| been moved into ${COURIERCONF}, and have a new"
-    echo "| format."
-    echo "| "
-    echo "| The older format files have been detected on your"
-    echo "| installation, so be sure to update these from the"
-    echo "| ones in ${PREFIX}/share/examples/courier-imap"
-    echo "+---------------"
-    echo
-}
-
-do_notice2()
-{
-    echo
-    echo "+---------------"
-    echo "| As of Courier-IMAP 1.3.5, we have switched to using the "
-    echo "| authdaemon mechanism to handle authentication."
-    echo "| "
-    echo "| Please check your configuration files and update them "
-    echo "| from ${PREFIX}/share/examples/courier-imap"
-    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)
-        if [ -f /etc/imapd.cnf -o -f /etc/imapd.config -o -f /etc/imapd-ssl.config ]; then
-		do_notice
-	fi
-	if [ -d ${COURIERCONF} -a ! -f ${COURIERCONF}/authdaemonrc ]; then
-		do_notice2
-        fi
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0