diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults
new file mode 100644
index 0000000000..31b1813175
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults
@@ -0,0 +1 @@
+USE="systemd"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords
new file mode 100644
index 0000000000..f8ac58ccf3
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords
@@ -0,0 +1,9 @@
+sys-apps/systemd                ~amd64 ~x86
+sys-apps/systemd-ui             ~amd64 ~x86
+sys-apps/systemd-sysv-utils     ~amd64 ~x86
+sys-apps/efunctions             ~amd64 ~x86
+
+# Various dependencies that also need to be up-to-date
+sys-apps/hwids                  ~amd64 ~x86
+sys-apps/kmod                   ~amd64 ~x86
+virtual/udev                    ~amd64 ~x86
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask
new file mode 100644
index 0000000000..3123811515
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask
@@ -0,0 +1,4 @@
+# Mask sysvinit+openrc and runit+openrc in favor of systemd
+sys-apps/sysvinit
+sys-apps/openrc
+sys-process/runit
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask
new file mode 100644
index 0000000000..98fe7d9c06
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask
@@ -0,0 +1,3 @@
+sys-apps/systemd
+sys-apps/systemd-ui
+sys-apps/systemd-sysv-utils
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages
new file mode 100644
index 0000000000..b0731093a1
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages
@@ -0,0 +1,2 @@
+# Add systemd to the 'system' set
+*sys-apps/systemd
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build
new file mode 100644
index 0000000000..0c10a6cd7a
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build
@@ -0,0 +1,2 @@
+sys-apps/dbus
+sys-apps/efunctions
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask
new file mode 100644
index 0000000000..6259b323fc
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask
@@ -0,0 +1,2 @@
+openrc
+-systemd
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild
index a7a09b2e37..7a073d2c6a 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.14 2013/05/20 17:56:20 ago Exp $
 
+EAPI=1
 inherit eutils multilib
 
 DESCRIPTION="Filesystem baselayout and init scripts"
@@ -12,9 +13,10 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build kernel_linux"
+IUSE="build kernel_linux +openrc"
 
-PDEPEND="sys-apps/openrc"
+PDEPEND="openrc? ( sys-apps/openrc )
+	!openrc? ( sys-apps/efunctions )"
 
 pkg_setup() {
 	multilib_layout
diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/init/init-0.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/init/init-0.ebuild
new file mode 100644
index 0000000000..c08454afae
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/virtual/init/init-0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/init/init-0.ebuild,v 1.16 2012/05/16 07:40:58 heroxbd Exp $
+
+DESCRIPTION="Virtual for various init implementations"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="!prefix? (
+	kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6
+						 sys-apps/systemd-sysv-utils
+						 sys-process/runit ) )
+	kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)"
+DEPEND=""