diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
index fecf29895a..3200501de2 100644
--- a/Mk/Uses/gssapi.mk
+++ b/Mk/Uses/gssapi.mk
@@ -89,6 +89,7 @@ IGNORE=	You are using OpenSSL from ports and have selected GSSAPI from base, ple
 .      if exists(/usr/libexec/krb5kdc)
          # Base has MIT KRB5 installed
 KRB5_HOME?=	/usr
+KRB5_TYPE=	mit
 GSSAPIBASEDIR=	${KRB5_HOME}
 GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
 GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
@@ -99,6 +100,7 @@ GSSAPILDFLAGS=
 .      else
          # Base has Heimdal KRB5 installed
 HEIMDAL_HOME=	/usr
+KRB5_TYPE=	heimdal
 GSSAPIBASEDIR=	${HEIMDAL_HOME}
 GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
 GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
@@ -110,6 +112,7 @@ GSSAPILDFLAGS=
 .    elif ${_local} == "heimdal"
 	# Heimdal port selected
 HEIMDAL_HOME?=	${LOCALBASE}
+KRB5_TYPE=	heimdal
 GSSAPIBASEDIR=	${HEIMDAL_HOME}
 GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib/heimdal
 GSSAPIINCDIR=	${GSSAPIBASEDIR}/include/heimdal
@@ -127,6 +130,7 @@ _RPATH=		${GSSAPILIBDIR}
 .    elif ${_local} == "mit"
 	# MIT KRB5 port selected
 KRB5_HOME?=	${LOCALBASE}
+KRB5_TYPE=	mit
 GSSAPIBASEDIR=	${KRB5_HOME}
 GSSAPILIBDIR=	${GSSAPIBASEDIR}/lib
 GSSAPIINCDIR=	${GSSAPIBASEDIR}/include
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 788c344ee5..782306398f 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -148,23 +148,18 @@ FS_DISKD_VARS=			DISKIO_MODULES+=DiskDaemon \
 				STORAGE_SCHEMES+=diskd
 FS_ROCK_VARS=			STORAGE_SCHEMES+=rock
 GSSAPI_BASE_USES=		gssapi
-GSSAPI_BASE_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
-				--with-heimdal-krb5=${GSSAPIBASEDIR} \
-				krb5_config=${GSSAPIBASEDIR}/bin/krb5-config
 GSSAPI_BASE_PLIST_SUB=		AUTH_KERB=""
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
-GSSAPI_HEIMDAL_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
-				--with-heimdal-krb5=${GSSAPIBASEDIR} \
-				krb5_config=${GSSAPIBASEDIR}/bin/krb5-config
 GSSAPI_HEIMDAL_PLIST_SUB=	AUTH_KERB=""
 GSSAPI_MIT_USES=		gssapi:mit
-GSSAPI_MIT_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
-				--with-mit-krb5=${GSSAPIBASEDIR} \
-				krb5_config=${GSSAPIBASEDIR}/bin/krb5-config
 GSSAPI_MIT_PLIST_SUB=		AUTH_KERB=""
+GSSAPI_NONE_CFLAGS_OFF=		${GSSAPICPPFLAGS}
 GSSAPI_NONE_CONFIGURE_ON=	--without-gnugss \
 				--without-heimdal-krb5 \
 				--without-mit-krb5
+GSSAPI_NONE_CONFIGURE_OFF=	${GSSAPI_CONFIGURE_ARGS} \
+				--with-${KRB5_TYPE}-krb5=${GSSAPIBASEDIR} \
+				krb5_config=${GSSAPIBASEDIR}/bin/krb5-config
 HTCP_CONFIGURE_ENABLE=		htcp
 ICAP_CONFIGURE_ENABLE=		icap-client
 ICMP_CONFIGURE_ENABLE=		icmp