diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r8.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r8.ebuild
new file mode 120000
index 0000000000..512b17810f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r8.ebuild
@@ -0,0 +1 @@
+baselayout-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
index bfff362158..338b9364c4 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
@@ -13,7 +13,7 @@ else
 	KEYWORDS="amd64 arm x86"
 fi
 
-inherit cros-workon eutils multilib systemd
+inherit cros-workon cros-tmpfiles eutils multilib systemd
 
 DESCRIPTION="Filesystem baselayout for CoreOS"
 HOMEPAGE="http://www.coreos.com/"
@@ -24,8 +24,7 @@ SLOT="0"
 IUSE="cros_host symlink-usr"
 
 # This version of baselayout replaces coreos-base
-DEPEND="sys-apps/systemd
-	!coreos-base/coreos-base
+DEPEND="!coreos-base/coreos-base
 	!<sys-libs/glibc-2.17-r1
 	!<=sys-libs/nss-usrfiles-2.18.1_pre"
 
@@ -107,19 +106,24 @@ src_install() {
 		dosym "${LIB_SYMS[$sym]}" "${sym}"
 	done
 	if use symlink-usr; then
-		systemd_dotmpfilesd "${T}/baselayout-usr.conf"
-		systemd-tmpfiles --root="${D}" --create
+		for sym in "${!USR_SYMS[@]}" ; do
+			dosym "${USR_SYMS[$sym]}" "${sym}"
+		done
 	fi
 
 	emake DESTDIR="${D}" install
 
+	if use symlink-usr; then
+		systemd_dotmpfilesd "${T}/baselayout-usr.conf"
+	fi
+
 	if use cros_host; then
 		# do not install networkd's resolv.conf symlink in SDK
 		rm "${D}"/usr/lib/tmpfiles.d/baselayout-resolv.conf || die
 	fi
 
 	# Fill in all other paths defined in tmpfiles configs
-	systemd-tmpfiles --root="${D}" --create
+	tmpfiles_create
 
 	# handle multilib paths.  do it here because we want this behavior
 	# regardless of the C library that you're using.  we do explicitly