diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild
deleted file mode 100644
index e4f0d0463e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2013 Brandon Philips. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-# $Header:$
-#
-
-EAPI=3
-CROS_WORKON_PROJECT="coreos/efunctions"
-CROS_WORKON_LOCALNAME="efunctions"
-inherit eutils cros-workon
-
-DESCRIPTION="standalone replacement for functions.sh"
-HOMEPAGE="https://bitbucket.org/coreos/efunctions"
-SRC_URI=""
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# make functions.sh available in /etc/init.d
-	# Note: we cannot replace the symlink with a file here, or Portage will
-	# config-protect it, and etc-update can't handle symlink to file updates
-	dodir etc/init.d
-	dosym ../../usr/lib/efunctions/functions.sh /etc/init.d/functions.sh
-
-    local dst_dir=/usr/lib/${PN}
-	dodir $dst_dir || die
-	insinto $dst_dir
-
-	doins ${S}/functions.sh
-	doins -r ${S}/efunctions
-
-	fperms -R +x $dst_dir
-
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords
index 7cef49f6cf..1506117e7d 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords
@@ -84,7 +84,7 @@
 =dev-lang/go-1.1 ~amd64
 
 # Replace the function.sh script in baselayout
-=coreos-base/efunctions-9999 ~amd64 ~x86
+=sys-apps/efunctions-1 ~amd64 ~x86
 
 # Projects we are actively hacking on in coreos
 =coreos-base/update_engine-9999 ~amd64 ~x86
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask
index 01622cffaf..4a1e4af959 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask
@@ -13,3 +13,6 @@
 
 # libpng security vulnerability fix
 <media-libs/libpng-1.2.44
+
+# Replaced by sys-apps/efunctions
+coreos-base/efunctions
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages
index 61e2babe4c..d0b097bcb7 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages
@@ -12,3 +12,4 @@
 #*sys-apps/busybox
 *sys-apps/man-pages
 *sys-apps/util-linux
+*sys-apps/efunctions
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build
index 0ae2369c65..b017c84c62 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build
@@ -20,6 +20,7 @@ sys-devel/libtool
 sys-apps/baselayout
 sys-apps/coreutils
 sys-apps/diffutils
+sys-apps/efunctions
 sys-apps/file
 sys-apps/findutils
 sys-apps/gawk
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/Manifest
new file mode 100644
index 0000000000..96ead778c0
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/Manifest
@@ -0,0 +1 @@
+DIST efunctions-1.tar.gz 1903 SHA256 c8f3056accc0406197f6b32c85b4e87ed9ab683392beb99e1fab0d53017fdcd4 SHA512 48250736f27fed8e8d3a91a94d816115a3f971fa6e4df5b31a771a3cd80edc887d7683850c2c4e0bf58675b4dd8a23eb28a04c8b4332a95cfe86b0409ca0843b WHIRLPOOL 331557e81da1f06aeeeec63a306167d3b76e50c70f0cd6ac44eb66f31617df688c182077dc2a01417a119370e555c62d8443dc3160c5193c6a18e6840aac5094
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/efunctions-1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/efunctions-1.ebuild
new file mode 100644
index 0000000000..2428ee436c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/efunctions-1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit multilib vcs-snapshot
+
+DESCRIPTION="Stand-alone and portable version of Gentoo's functions.sh"
+HOMEPAGE="https://github.com/marcusatbang/efunctions"
+GIT_COMMIT=b35f73e902fc0a6977260a1d6e8b287ae3b1c82a
+SRC_URI="${HOMEPAGE}/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+
+# FIXME(marineam): The origional functions.sh claims 2-clause BSD but
+# efunctions has no license declared. Assume it is unchanged until I
+# contact the author and get that sorted out...
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!sys-apps/openrc
+	!<sys-apps/baselayout-2.0
+	!coreos-base/efunctions
+	"
+
+src_install() {
+	local dst_dir=/usr/$(get_libdir)/${PN}
+
+	dodir etc/init.d
+	dosym ../..${dst_dir}/functions.sh /etc/init.d/functions.sh
+
+	dodir $dst_dir
+	insinto $dst_dir
+	doins ${S}/functions.sh
+	doins -r ${S}/efunctions
+
+	fperms -R +x $dst_dir
+}