diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/files/proc-xen.mount b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/files/proc-xen.mount
new file mode 100644
index 0000000000..2213272f5c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/files/proc-xen.mount
@@ -0,0 +1,9 @@
+[Unit]
+Before=local-fs.target
+DefaultDependencies=false
+ConditionVirtualization=xen
+
+[Mount]
+What=xenfs
+Where=/proc/xen
+Type=xenfs
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0-r1.ebuild
similarity index 90%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0-r1.ebuild
index 63db44d42e..9e6dcf926f 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.4.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit multilib python-any-r1 toolchain-funcs
+inherit multilib python-any-r1 systemd toolchain-funcs
 
 MY_PV=${PV/_/-}
 S="${WORKDIR}/xen-${MY_PV}"
@@ -70,4 +70,7 @@ src_compile() {
 src_install() {
 	dolib.so tools/xenstore/libxenstore.so*
 	dobin tools/xenstore/xenstore
+
+	systemd_dounit "${FILESDIR}"/proc-xen.mount
+	systemd_enable_service local-fs.target proc-xen.mount
 }