--- a/samba-4.5.3.ebuild	2016-12-20 14:34:19.000000000 +0100
+++ b/samba-4.5.3.ebuild	2017-01-17 10:24:58.673873875 +0100
@@ -26,7 +26,7 @@
 SLOT="0"
 
 IUSE="acl addc addns ads client cluster cups dmapi fam gnutls iprint
-ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind zeroconf"
+ldap pam quota selinux syslog systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -68,9 +68,8 @@
 	gnutls? ( dev-libs/libgcrypt:0
 		>=net-libs/gnutls-1.4.0 )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )"
+	systemd? ( sys-apps/systemd:0= )
+	!app-crypt/heimdal"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
@@ -79,7 +78,7 @@
 	!dev-perl/Parse-Yapp
 "
 
-REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
+REQUIRED_USE="addc? ( gnutls )
 	ads? ( acl gnutls ldap )
 	${PYTHON_REQUIRED_USE}"
 
@@ -123,8 +122,7 @@
 		--localstatedir="${EPREFIX}/var"
 		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
 		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries=NONE
-		--builtin-libraries=NONE
+		--bundled-libraries=heimdal
 		--disable-rpath
 		--disable-rpath-install
 		--nopyc
@@ -149,7 +147,6 @@
 			$(use_with quota quotas)
 			$(use_with syslog)
 			$(use_with systemd)
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
 			$(use_with winbind)
 			$(usex test '--enable-selftest' '')
 			$(use_enable zeroconf avahi)
@@ -173,7 +170,6 @@
 			--without-quotas
 			--without-syslog
 			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
 			--without-winbind
 			--disable-python
 		)