diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 77551690cfc..c407ef8b2ef 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,15 +1,12 @@
 COMMENT-main=		imap server for maildir format mailboxes
 COMMENT-pop3=		pop3 server for maildir format mailboxes
 
-V=			5.1.7
+V=			5.1.8
 DISTNAME=		courier-imap-${V}
 PKGNAME-main=		${DISTNAME}
 FULLPKGNAME-pop3=	courier-pop3-${V}
 FULLPKGPATH-pop3=	mail/courier-imap,-pop3
 
-REVISION-main=		2
-REVISION-pop3=		2
-
 CATEGORIES=		mail
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=courier/}
@@ -72,7 +69,7 @@ CONFIGURE_ARGS=		--sbindir=${PREFIX}/sbin \
 
 DOCS=			AUTHORS INSTALL \
 			NEWS libs/imap/ChangeLog \
-			libs/imap/README libs/imap/README.proxy \
+			libs/imap/README.proxy \
 			libs/maildir/README.imapkeywords.html \
 			libs/maildir/README.maildirfilter.html \
 			libs/maildir/README.maildirquota.txt \
@@ -125,8 +122,6 @@ post-extract:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/courier
-	${INSTALL_DATA} ${WRKSRC}/libs/imap/README \
-	    ${PREFIX}/share/doc/courier/README.imap.txt
 .	for i in ${DOCS}
 	     ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/courier
 .	endfor
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 1422db3fcdc..21e79e009b6 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (courier-imap-5.1.7.tar.bz2) = vzd1RCWZPXsVsucrCvYGHkHTILxZjJxi4IbWUPcRUt8=
-SIZE (courier-imap-5.1.7.tar.bz2) = 3364221
+SHA256 (courier-imap-5.1.8.tar.bz2) = JzLqFIom6MqickxLg/Eljpvu9UeGvlA/qSNV0neO8mk=
+SIZE (courier-imap-5.1.8.tar.bz2) = 3395074
diff --git a/mail/courier-imap/pkg/PLIST-main b/mail/courier-imap/pkg/PLIST-main
index c4c3518b3fe..fe40cddb450 100644
--- a/mail/courier-imap/pkg/PLIST-main
+++ b/mail/courier-imap/pkg/PLIST-main
@@ -44,9 +44,7 @@ share/doc/courier/AUTHORS
 share/doc/courier/ChangeLog
 share/doc/courier/INSTALL
 share/doc/courier/NEWS
-share/doc/courier/README
 share/doc/courier/README.couriertls
-share/doc/courier/README.imap.txt
 share/doc/courier/README.imapkeywords.html
 share/doc/courier/README.maildirfilter.html
 share/doc/courier/README.maildirquota.txt