diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 1c49e9f09d9a..34281d8a7c7e 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	https://www.cyrusimap.org/releases/ \
 PKGNAMESUFFIX=	24
 
 MAINTAINER=	ume@FreeBSD.org
-COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
+COMMENT=	Cyrus mail server, supporting POP3 and IMAP4 protocols
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
@@ -41,7 +41,7 @@ MAKE_JOBS_UNSAFE=	yes
 CPE_VENDOR=	cmu
 CPE_PRODUCT=	cyrus_imap_server
 
-OPTIONS_DEFINE=		AUTOCREATE AUTOSIEVE BDB DRAC IDLED LDAP \
+OPTIONS_DEFINE=		AUTOCREATE AUTOSIEVE BDB IDLED LDAP \
 			MURDER MYSQL NETSCAPEHACK NNTP PGSQL \
 			REPLICATION SNMP SQLITE DOCS EXAMPLES
 OPTIONS_DEFAULT=	BDB IDLED
@@ -51,10 +51,6 @@ AUTOSIEVE_DESC=		Use autosievefolder patch (UoA)
 BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb-libdir=${LOCALBASE}/lib
-DRAC_DESC=		Enable DRAC support
-DRAC_CONFIGURE_ON=	--with-drac=${LOCALBASE}
-DRAC_BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:mail/drac
-DRAC_USES=		autoreconf
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
@@ -111,8 +107,6 @@ AUTOSIEVE_PATCH_SITES=	LOCAL/mm:autosieve
 AUTOSIEVE_PATCHFILES=	${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch:-p1:autosieve
 AUTOSIEVE_EXTRA_PATCHES=${FILESDIR}/extra-patch-imap__lmtp_sieve.c
 
-DRAC_EXTRA_PATCHES=	${FILESDIR}/extra-patch-cmulocal_sasl2.m4
-
 MANDIRS=	${CYRUS_PREFIX}/man
 
 PORTDOCS=	*
@@ -156,10 +150,6 @@ BDB_LIB_NAME=	no
 CONFIGURE_ARGS+=--disable-gssapi
 .endif
 
-pre-patch-DRAC-on:
-	${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 \
-		< ${WRKSRC}/contrib/drac_auth.patch
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
@@ -169,9 +159,6 @@ post-patch:
 			  -e "s|/usr/sieve|/var/imap/sieve|g" \
 		${WRKSRC}/tools/masssievec
 
-post-patch-DRAC-on:
-	@${RM} -r ${WRKSRC}/autom4te.cache
-
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf \
@@ -208,7 +195,7 @@ post-install-DOCS-on:
 # need to create it.
 post-install-EXAMPLES-on:
 .for f in ${CONFS:Nnormal.conf}
-	@${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \
+	${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \
 		${STAGEDIR}${EXAMPLESDIR}
 	@${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
 .endfor
diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal_sasl2.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal_sasl2.m4
deleted file mode 100644
index 53131668fcfd..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-cmulocal_sasl2.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cmulocal/sasl2.m4
-diff -u cmulocal/sasl2.m4.orig cmulocal/sasl2.m4
---- cmulocal/sasl2.m4.orig	2009-05-20 21:24:48.000000000 +0900
-+++ cmulocal/sasl2.m4	2009-12-22 00:31:16.153536453 +0900
-@@ -105,7 +105,7 @@
-   if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
-     gss_failed=0
-     AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",gss_failed=1,
--                 ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET})
-+                 ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509)
-     if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
-       gss_impl="failed"
-     fi
-@@ -173,7 +173,7 @@
-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
-   elif test "$gss_impl" = "heimdal"; then
-     CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
--    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509"
-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-   elif test "$gss_impl" = "cybersafe03"; then
- # Version of CyberSafe with two libraries