diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 965319e4a9e..d446693b2ee 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2000/07/03 03:42:55 turan Exp $ 
+# $OpenBSD: Makefile,v 1.1.1.2 2000/07/03 08:11:24 kevlo Exp $ 
 
 DISTNAME=	courier-imap-0.35
-NEED_VERSION=	1.273
 CATEGORIES=	mail
+NEED_VERSION=	1.311
 MASTER_SITES=	ftp://download.sourceforge.net/pub/sourceforge/courier/
 
 MAINTAINER=	anil@recoil.org
@@ -12,11 +12,14 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FAKE=	Yes
+RUN_DEPENDS= 	stunnel::security/stunnel
 
-SYSCONFDIR= /usr/local/share/courier-imap
-GNU_CONFIGURE=	Yes
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/share/courier-imap
 
-RUN_DEPENDS= stunnel::security/stunnel
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/courier-imap
+	${INSTALL_DATA} ${WRKSRC}/imapd-ssl.config ${PREFIX}/share/courier-imap
+	${INSTALL_DATA} ${WRKSRC}/imapd.config ${PREFIX}/share/courier-imap
 
 .include <bsd.port.mk>
diff --git a/mail/courier-imap/pkg/COMMENT b/mail/courier-imap/pkg/COMMENT
index 10019810148..7ad34716a46 100644
--- a/mail/courier-imap/pkg/COMMENT
+++ b/mail/courier-imap/pkg/COMMENT
@@ -1 +1 @@
-IMAP server for Maildir format mailboxes
+imap server for maildir format mailboxes