diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index e856c529cb8..3a821916139 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -3,6 +3,7 @@ PORTROACH=		limitw:1,even
 COMMENT=		Cyrus IMAP server
 
 V=			3.6.0
+REVISION=		0
 DISTNAME=		cyrus-imapd-${V}
 
 SHARED_LIBS +=	cyrus                     0.0 # 0.0
diff --git a/mail/cyrus-imapd/patches/patch-imap_relocate_by_id_c b/mail/cyrus-imapd/patches/patch-imap_relocate_by_id_c
new file mode 100644
index 00000000000..a15260e28b5
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-imap_relocate_by_id_c
@@ -0,0 +1,13 @@
+Include appropriate header for basename(3).
+
+Index: imap/relocate_by_id.c
+--- imap/relocate_by_id.c.orig
++++ imap/relocate_by_id.c
+@@ -42,6 +42,7 @@
+ 
+ #include <config.h>
+ 
++#include <libgen.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif