--- Makefile.orig	2011-01-17 19:35:14.000000000 +0100
+++ Makefile	2011-01-17 20:16:22.000000000 +0100
@@ -45,17 +45,12 @@
 PLIST_SUB=	VERSION="2.32" EVO_VERSION="1.2"
 
 #OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off
-OPTIONS=	WEATHER "Enable weather calendar backend" on
+OPTIONS=	WEATHER		"Enable weather calendar backend"	on	\
+		KERBEROS	"Adds Kerberos support"			on	\
 
 .include <bsd.port.pre.mk>
 
-.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS)
-HEIMDAL_HOME?=		${LOCALBASE}
-LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} \
-			--with-krb5-includes=${HEIMDAL_HOME}/include
-KRB5_LIB=		`${HEIMDAL_HOME}/bin/krb5-config gssapi --libs`
-.elif !defined(NO_KERBEROS)
+.if !defined(WITHOUT_KERBEROS)
 CONFIGURE_ARGS+=	--with-krb5=/usr
 KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
 .endif