diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
index e461716370..619f613e66 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild
@@ -13,6 +13,10 @@ SLOT="0"
 KEYWORDS="amd64 arm64"
 IUSE=""
 
+# Depend on everything OEMs need, but not the OEMs themselves.
+# This makes the built packages available for image_vm_util.sh but
+# avoids copying the oem specific files (e.g. grub configs) before
+# the oem partition is set up.
 DEPEND=""
 RDEPEND="
 	amd64? (
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
index 899aec207e..d62f7cd4a7 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-DESCRIPTION="Meta ebuild for everything that should be in the SDK."
+DESCRIPTION="Meta ebuild for everything that needs to be in the SDK."
 HOMEPAGE="http://coreos.com/docs/sdk/"
 SRC_URI=""
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild
new file mode 100644
index 0000000000..74cd9a984b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-extras/sdk-extras-0.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2017 The CoreOS Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This isn't meant to be installed directly. It mostly exists so we can better keep track of
+# dependencies within the SDK.
+
+EAPI=5
+
+DESCRIPTION="Meta ebuild for everything that isn't needed in the SDK, but might be useful"
+HOMEPAGE="http://coreos.com/docs/sdk/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+RDEPEND="
+	app-admin/python-updater
+	app-backup/casync
+	app-crypt/efitools
+	app-crypt/tpm-tools
+	app-editors/emacs
+	app-editors/nano
+	app-portage/eix
+	app-portage/gentoolkit-dev
+	app-portage/repoman
+	app-misc/screen
+	app-misc/tmux
+	app-text/tree
+	app-text/dos2unix
+	dev-util/cscope
+	dev-util/perf
+	dev-util/strace
+	dev-util/valgrind
+	dev-go/glide
+	dev-go/godep
+	dev-python/awscli
+	sys-apps/ed
+"
+
+# Needed for Jenkins
+RDEPEND+="
+	dev-util/catalyst
+"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords
index 3e36240a6c..634255d859 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords
@@ -7,3 +7,7 @@ dev-python/botocore ~amd64
 dev-lang/rust ~amd64
 dev-util/cargo ~amd64
 virtual/rust ~amd64
+
+# Accept go utilities
+dev-go/glide ~amd64
+dev-go/godep ~amd64