diff -urN courier.orig/Makefile courier/Makefile
--- courier.orig/Makefile	2008-12-30 16:57:14.000000000 +0100
+++ courier/Makefile	2009-03-01 16:01:38.000000000 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.60.0
+PORTVERSION=	0.61.1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -54,7 +54,6 @@
 MAILGID=	465
 ETCDIR=		${PREFIX}/etc
 SYSCONFDIR=	${ETCDIR}/courier
-USERDB?=	${ETCDIR}/userdb
 LIBEXECDIR=	${PREFIX}/libexec
 LOCALSTATEDIR=	/var/spool/courier
 CACHEDIR=	/var/spool/webmail
@@ -79,7 +78,8 @@
 		LDFLAGS='${LDFLAGS}'
 MAKE_ENV:=	${CONFIGURE_ENV}
 
-CONFIGURE_ARGS=	--disable-root-check --with-db=db \
+CONFIGURE_ARGS=	--disable-root-check \
+		--with-db=db \
 		--enable-syslog=1 --enable-use-flock \
 		--program-transform-name=s,^,, \
 		--enable-utf7-folder-encoding \
@@ -90,7 +90,6 @@
 		--with-mailgid=${MAILGID} \
 		--with-etcdir=${ETCDIR} \
 		--sysconfdir=${SYSCONFDIR} \
-		--with-userdb=${USERDB} \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
 		--localstatedir=${LOCALSTATEDIR} \
@@ -175,6 +174,27 @@
 OPTIONS+=off
 .endif
 
+OPTIONS+=MAILDROPFLAGS "maildrop set flags patch"
+.if defined(WITH_MAILDROPFLAGS)
+OPTIONS+=on
+.else
+OPTIONS+=off
+.endif
+
+OPTIONS+=WEBMAILXFACE "experimental webmail X-Face patch"
+.if defined(WITH_WEBMAILXFACE)
+OPTIONS+=on
+.else
+OPTIONS+=off
+.endif
+
+OPTIONS+=WEBMAILRSENT "enable Autorename Sent folder"
+.if !defined(WITHOUT_WEBMAILRSENT)
+OPTIONS+=on
+.else
+OPTIONS+=off
+.endif
+
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.doc"
 .include "${.CURDIR}/Makefile.man"
@@ -258,6 +278,20 @@
 CONFIGURE_ARGS+=--without-ipv6
 .endif
 
+.if defined(WITH_MAILDROPFLAGS) || !defined(WITHOUT_MAILDROPFLAGS)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-maildrop__maildir.C
+.endif
+
+.if defined(WITH_WEBMAILXFACE) || !defined(WITHOUT_WEBMAILXFACE)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__msg2html.c
+.endif
+
+.if defined(WITH_WEBMAILRSENT) || !defined(WITHOUT_WEBMAILRSENT)
+CONFIGURE_ARGS+=--enable-autorenamesent
+.else
+CONFIGURE_ARGS+=--disable-autorenamesent
+.endif
+
 pre-everything::
 	@${ECHO_MSG} "===> --------------------------------------------------------"
 	@${ECHO_MSG} "===>	Run 'make config' to (re)configure ${PKGNAME}"
diff -urN courier.orig/distinfo courier/distinfo
--- courier.orig/distinfo	2008-12-30 16:57:14.000000000 +0100
+++ courier/distinfo	2009-03-01 16:02:33.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (courier-0.60.0.tar.bz2) = 688d4b44c0d7438c5c47c0a65835846d
-SHA256 (courier-0.60.0.tar.bz2) = c13da0a0b76c4a59aa219d037129b8305293d1091143027f2dfd631b9e470e64
-SIZE (courier-0.60.0.tar.bz2) = 7067430
+MD5 (courier-0.61.1.tar.bz2) = a0feca15632f376401d865765ff172e3
+SHA256 (courier-0.61.1.tar.bz2) = 979ff8342f53478c8f14cb79290d1a795433375c8ad18fc5aa950595a9973c90
+SIZE (courier-0.61.1.tar.bz2) = 7229642