--- a/components/libneon/Makefile	Wed May 25 11:05:33 2016 -0700
+++ b/components/libneon/Makefile	Wed May 25 11:07:33 2016 -0700
@@ -90,19 +90,10 @@
 
 COMPONENT_TEST_ENV +=	PATH="$(GNUBIN):$(PATH)"
 
-# 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/libproxy
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += security/kerberos-5
 REQUIRED_PACKAGES += shell/ksh93
-ifeq ($(KRB5_API), solaris)
-    # require the solaris version of GSS
-    REQUIRED_PACKAGES += system/library/security/gss
-else
-    # require the Userland version of GSS
-    REQUIRED_PACKAGES += security/kerberos-5
-endif
+REQUIRED_PACKAGES += system/library/security/gss