--- a/components/squid/Makefile	Sat May 21 09:59:28 2016 -0700
+++ b/components/squid/Makefile	Fri May 13 15:40:39 2016 -0500
@@ -139,17 +139,27 @@
 	'-e "/Can not open file/d" ' \
 	'-e "/ERROR/p" '
 
+# If there is no mediator, use MIT.  Note, once all userland build systems have
+# the Userland security/kerberos-5 pkg installed this logic can be removed.
+KRB5_API = $(shell pkg mediator -H kerberos5 2>/dev/null | nawk '{print $$4;}')
+
 REQUIRED_PACKAGES += library/libtool/libltdl
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += $(PERL_PKG)
+ifeq ($(KRB5_API), solaris)
+    # require the solaris version of Kerberos/GSS
+    REQUIRED_PACKAGES += service/security/kerberos-5
+    REQUIRED_PACKAGES += system/library/security/gss
+else
+    # require the Userland version of Kerberos/GSS
+    REQUIRED_PACKAGES += security/kerberos-5
+endif
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
 REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += system/library/security/crypto
-REQUIRED_PACKAGES += system/library/security/gss
 REQUIRED_PACKAGES += system/library/security/libsasl
 REQUIRED_PACKAGES += system/library/security/libsasl2
 REQUIRED_PACKAGES += system/network
-REQUIRED_PACKAGES += service/security/kerberos-5