diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/ccache/ccache-3.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/ccache/ccache-3.2.2-r1.ebuild
similarity index 88%
rename from sdk_container/src/third_party/coreos-overlay/dev-util/ccache/ccache-3.2.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-util/ccache/ccache-3.2.2-r1.ebuild
index 18d2193073..a4ef5ec1f7 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-util/ccache/ccache-3.2.2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-util/ccache/ccache-3.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
@@ -25,6 +25,7 @@ src_prepare() {
 	rm -rf zlib || die
 	epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
 	epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
+	epatch "${FILESDIR}"/${PN}-3.2.2-save-temps.patch
 	sed \
 		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
 		"${FILESDIR}"/ccache-config-3 > ccache-config || die
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/ccache/files/ccache-3.2.2-save-temps.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/ccache/files/ccache-3.2.2-save-temps.patch
new file mode 100644
index 0000000000..6c7da052f6
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-util/ccache/files/ccache-3.2.2-save-temps.patch
@@ -0,0 +1,38 @@
+From 13259a28a6ace55f9397b2066173fecc4b296833 Mon Sep 17 00:00:00 2001
+From: Michael Marineau <michael.marineau@coreos.com>
+Date: Thu, 9 Jul 2015 13:13:33 -0700
+Subject: [PATCH] Bail out on --save-temps, an alias for -save-temps
+
+---
+ NEWS.txt  | 2 ++
+ compopt.c | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/NEWS.txt b/NEWS.txt
+index c1e121d..19b0ae2 100644
+--- a/NEWS.txt
++++ b/NEWS.txt
+@@ -18,6 +18,8 @@ Bug fixes
+ 
+ - Avoid calling `exit()` inside an exit handler.
+ 
++- Bail out on compiler option --save-temps in addition to -save-temps.
++
+ 
+ ccache 3.2.2
+ ------------
+diff --git a/compopt.c b/compopt.c
+index 26e1591..0fc9161 100644
+--- a/compopt.c
++++ b/compopt.c
+@@ -33,6 +33,7 @@ struct compopt {
+ 
+ static const struct compopt compopts[] = {
+ 	{"--param",         TAKES_ARG},
++	{"--save-temps",    TOO_HARD},
+ 	{"--serialize-diagnostics", TAKES_ARG | TAKES_PATH},
+ 	{"-A",              TAKES_ARG},
+ 	{"-D",              AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG},
+-- 
+2.3.6
+
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 8f013e62d5..c922f0a140 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
@@ -109,6 +109,3 @@ dev-util/checkbashisms
 
 # Avoid cross compile error with amd64 stable (elfutils-0.158).
 =dev-libs/elfutils-0.161 ~amd64
-
-# Avoid locking bugs that bit us in the 3.1.x series.
-=dev-util/ccache-3.2.2