diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest
new file mode 100644
index 0000000000..656980e702
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest
@@ -0,0 +1 @@
+DIST go1.3.2.src.tar.gz 10049331 SHA256 3e7488241c2bf30833629ecbef61e423fe861c6d6d69d2d21a16d2c29eef06fb SHA512 bd4f5e93e191e0868008e09f32de8dfb457f1da50121a7c6a72c810f228e7e6dfa59f3a13f55d2813bea77eb31d125180c193fc572e49beb259d2a3732e4a058 WHIRLPOOL abde72cfaa220d32aedfd54b0e7948049f7d16867dc08d976377b6985be50342572cffcdf577469dc2a6d1117ef8fc2b7e7eeea1f15bcba05cd6050aadc9f988
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/files/go-1.2-no-Werror.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/files/go-1.2-no-Werror.patch
new file mode 100644
index 0000000000..01f183edb0
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/files/go-1.2-no-Werror.patch
@@ -0,0 +1,10 @@
+--- a/src/cmd/dist/build.c
++++ b/src/cmd/dist/build.c
+@@ -384,7 +384,6 @@ static char *proto_gccargs[] = {
+ 	"-Wno-switch",
+ 	"-Wno-comment",
+	"-Wno-missing-field-initializers",
+-	"-Werror",
+ 	"-fno-common",
+ 	"-ggdb",
+ 	"-pipe",
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.3.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.3.2.ebuild
new file mode 100644
index 0000000000..204fa0e0d5
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.3.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.3.1.ebuild,v 1.2 2014/08/28 11:20:50 mgorny Exp $
+
+EAPI=5
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+inherit bash-completion-r1 elisp-common eutils
+
+if [[ ${PV} = 9999 ]]; then
+	EHG_REPO_URI="https://go.googlecode.com/hg"
+	inherit mercurial
+else
+	SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
+	# Upstream only supports go on amd64, arm and x86 architectures.
+	KEYWORDS="-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
+fi
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="http://www.golang.org"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="emacs vim-syntax zsh-completion"
+
+DEPEND=""
+RDEPEND="emacs? ( virtual/emacs )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	zsh-completion? ( app-shells/zsh-completion )"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# The go language uses *.a files which are _NOT_ libraries and should not be
+# stripped.
+STRIP_MASK="/usr/lib/go/pkg/linux*/*.a /usr/lib/go/pkg/freebsd*/*.a"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}"/go
+fi
+
+src_prepare()
+{
+	if [[ ${PV} != 9999 ]]; then
+		epatch "${FILESDIR}"/${PN}-1.2-no-Werror.patch
+	fi
+	epatch_user
+}
+
+src_compile()
+{
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+	if [[ $CTARGET = armv5* ]]
+	then
+		export GOARM=5
+	fi
+
+	cd src
+	./make.bash || die "build failed"
+	cd ..
+
+	if use emacs; then
+		elisp-compile misc/emacs/*.el
+	fi
+}
+
+src_test()
+{
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+		./run.bash --no-rebuild --banner || die "tests failed"
+}
+
+src_install()
+{
+	dobin bin/*
+	dodoc AUTHORS CONTRIBUTORS PATENTS README
+
+	dodir /usr/lib/go
+	insinto /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] http://code.google.com/p/go/issues/detail?id=2775
+	doins -r doc include lib pkg src
+
+	dobashcomp misc/bash/go
+
+	if use emacs; then
+		elisp-install ${PN} misc/emacs/*.el misc/emacs/*.elc
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r misc/vim/ftdetect
+		doins -r misc/vim/ftplugin
+		doins -r misc/vim/syntax
+		doins -r misc/vim/plugin
+		doins -r misc/vim/indent
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/zsh/go
+	fi
+
+	fperms -R +x /usr/lib/go/pkg/tool
+}
+
+pkg_postinst()
+{
+	if use emacs; then
+		elisp-site-regen
+	fi
+
+	# If the go tool sees a package file timestamped older than a dependancy it
+	# will rebuild that file.  So, in order to stop go from rebuilding lots of
+	# packages for every build we need to fix the timestamps.  The compiler and
+	# linker are also checked - so we need to fix them too.
+	ebegin "fixing timestamps to avoid unnecessary rebuilds"
+	tref="usr/lib/go/pkg/*/runtime.a"
+	find "${EROOT}"usr/lib/go -type f \
+		-exec touch -r "${EROOT}"${tref} {} \;
+	eend $?
+
+	if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} &&
+		${REPLACING_VERSIONS} != ${PV} ]]; then
+		elog "Release notes are located at http://golang.org/doc/go${PV}"
+	fi
+}
+
+pkg_postrm()
+{
+	if use emacs; then
+		elisp-site-regen
+	fi
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
index 644b2ed0ec..c6fde76380 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
@@ -29,9 +29,6 @@
 =sys-apps/util-linux-2.22.2 ~amd64
 =dev-libs/opencryptoki-2.4.2 ~amd64
 
-# Go is masked but we need it.
-=dev-lang/go-1.2* ~amd64
-
 # Replace the function.sh script in baselayout
 =sys-apps/efunctions-1 ~amd64 ~x86
 
@@ -105,6 +102,3 @@ dev-util/checkbashisms
 =sys-boot/grub-2.02_beta2
 # current stable xen-tools doesn't build without multilib
 =app-emulation/xen-tools-4.4.0-r9
-
-# 1.3 is marked stable but 1.3.1 hasn't yet
-=dev-lang/go-1.3.1