Index: mail/dovecot2-pigeonhole/Makefile
===================================================================
--- mail/dovecot2-pigeonhole/Makefile	(revision 418450)
+++ mail/dovecot2-pigeonhole/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.4.15
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
@@ -28,7 +29,20 @@
 USE_LDCONFIG=	${PREFIX}/lib/dovecot
 
 OPTIONS_DEFINE=	DOCS LDAP MANAGESIEVE
-OPTIONS_DEFAULT=MANAGESIEVE
+OPTIONS_DEFAULT=MANAGESIEVE GSSAPI_NONE
+
+OPTIONS_SINGLE=	GSSAPI
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
+
+GSSAPI_DESC=		GSSAPI Support (must match mail/dovecot2)
+GSSAPI_NONE_DESC=	Build without GSSAPI support
+GSSAPI_BASE_DESC=	Use GSSAPI from base
+GSSAPI_HEIMDAL_DESC=	Use Heimdal GSSAPI from security/heimdal
+GSSAPI_MIT_DESC=	Use MIT GSSAPI from security/krb5
+
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+GSSAPI_MIT_USES=	gssapi:mit
 OPTIONS_SUB=	yes
 
 MANAGESIEVE_DESC=		ManageSieve support