diff --git a/www/neon/Makefile b/www/neon/Makefile
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	neon
 DISTVERSION=	0.32.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://notroj.github.io/neon/
 
@@ -17,12 +17,13 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static
 
-OPTIONS_DEFINE=		DOCS GSSAPI NLS PROXY
-OPTIONS_DEFAULT=	EXPAT GSSAPI OPENSSL
+OPTIONS_DEFINE=		DOCS NLS PROXY
+OPTIONS_DEFAULT=	EXPAT GSSAPI_BASE OPENSSL
 
 OPTIONS_RADIO=		SSL
 OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
-OPTIONS_SINGLE=		XML
+OPTIONS_SINGLE=		GSSAPI XML
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SINGLE_XML=	EXPAT LIBXML2
 
 DOCS_DESC=		Build and/or install documentation (including manpages)
@@ -41,7 +42,13 @@
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--with-ssl=gnutls
 
-GSSAPI_CONFIGURE_WITH=	gssapi
+GSSAPI_BASE_USES=		gssapi
+GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi
+GSSAPI_HEIMDAL_USES=		gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi
+GSSAPI_MIT_USES=		gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi
+GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 
 LIBXML2_CONFIGURE_WITH=	libxml2
 LIBXML2_USES=		gnome