diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 4e5b1a6beb84..31fc4ed8df8c 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.4.19
-PORTREVISION=	1
+PORTVERSION=	2.4.20
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 56ef0ba2cd9f..8aa0c7f645a7 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1494954318
-SHA256 (cyrus-imapd-2.4.19.tar.gz) = 5ef3cef8e394901fba162f14eb43f5e364b266234eff28d17273303c019f8ef1
-SIZE (cyrus-imapd-2.4.19.tar.gz) = 2488567
+TIMESTAMP = 1503022081
+SHA256 (cyrus-imapd-2.4.20.tar.gz) = 3a09146701cda2416d1a2be81f066e14397b211d72c714c54bac09fc65d8dd5e
+SIZE (cyrus-imapd-2.4.20.tar.gz) = 2488878
 SHA256 (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 1130e80b6604901ba8cf887c792fa8e4ef181b4cfc212720bcfc984163fe8a13
 SIZE (cyrus-imapd-2.4.4-autocreate-0.10-0.patch) = 74039
 SHA256 (cyrus-imapd-2.4.12-autosieve-0.6.0.patch) = daafab6c1a824d1d16745ea25a0bb6e404655ef690961e1dc236805e5c923135
diff --git a/mail/cyrus-imapd24/files/patch-imap__lmtpd.c b/mail/cyrus-imapd24/files/patch-imap__lmtpd.c
deleted file mode 100644
index 14701d9ccc9b..000000000000
--- a/mail/cyrus-imapd24/files/patch-imap__lmtpd.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- imap/lmtpd.c.orig	2017-05-15 05:43:30 UTC
-+++ imap/lmtpd.c
-@@ -712,9 +712,10 @@ int deliver(message_data_t *msgdata, cha
- 
-     /* loop through each recipient, attempting delivery for each */
-     for (n = 0; n < nrcpts; n++) {
--	char namebuf[MAX_MAILBOX_BUFFER] = "", *server;
-+	char namebuf[MAX_MAILBOX_BUFFER] = "";
- 	char userbuf[MAX_MAILBOX_BUFFER];
- 	const char *rcpt, *user, *domain, *mailbox;
-+	char *server = NULL;
- 	int r = 0;
- 
- 	rcpt = msg_getrcptall(msgdata, n);
-@@ -954,7 +955,7 @@ static int verify_user(const char *user,
-     }
- 
-     if (!r) {
--	char *server, *acl;
-+	char *server = NULL, *acl = NULL;
- 	long aclcheck = !user ? ACL_POST : 0;
- 	/*
- 	 * check to see if mailbox exists and we can append to it:
-@@ -1061,8 +1062,9 @@ FILE *spoolfile(message_data_t *msgdata)
-        (don't bother if we're only a proxy) */
-     n = isproxy ? 0 : msg_getnumrcpt(msgdata);
-     for (i = 0; !f && (i < n); i++) {
--	char namebuf[MAX_MAILBOX_BUFFER] = "", *server;
-+	char namebuf[MAX_MAILBOX_BUFFER] = "";
- 	const char *user, *domain, *mailbox;
-+	char *server = NULL;
- 	int r;
- 
- 	/* build the mailboxname from the recipient address */