diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/setools/setools-3.3.8-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/setools/setools-3.3.8-r7.ebuild
index 002e6c04b3..2ccd419ff6 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/setools/setools-3.3.8-r7.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/setools/setools-3.3.8-r7.ebuild
@@ -87,6 +87,7 @@ src_configure() {
 		--with-java-prefix=${JAVA_HOME} \
 		--disable-selinux-check \
 		--disable-bwidget-check \
+		--with-sepol-devel=${ROOT}/usr \
 		$(use_enable python swig-python) \
 		$(use_enable java swig-java) \
 		$(use_enable X swig-tcl) \
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/setools b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/setools
index 978f8c7c8a..882a117cd1 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/setools
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/app-admin/setools
@@ -1,2 +1,2 @@
-export ac_cv_file__usr_lib64_libsepol_a=yes
+export ac_cv_file__build_amd64_usr__usr_lib64_libsepol_a=yes
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild
index 05733bf86e..4683dcd6b1 100644
--- a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-2.20141203-r5.ebuild,v 1.3 2015/06/05 16:10:26 perfinion Exp $
 EAPI="5"
 
-inherit eutils
+inherit eutils systemd
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-2.4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-2.4.ebuild
index 7ff3701e65..c5b7631d1b 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-2.4.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-2.4.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
-inherit multilib python-r1 toolchain-funcs eutils
+inherit multilib python-r1 toolchain-funcs eutils systemd
 
 MY_P="${P//_/-}"
 
@@ -100,6 +100,7 @@ src_compile() {
 			INOTIFYH="$(usex dbus)" \
 			SESANDBOX="n" \
 			CC="$(tc-getCC)" \
+			PREFIX="${ROOT}" \
 			PYLIBVER="${EPYTHON}" \
 			LIBDIR="\$(PREFIX)/$(get_libdir)"
 	}