diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/bootcache/bootcache-0.0.1-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/bootcache/bootcache-0.0.1-r13.ebuild
index 96bd9dc866..54165a77fa 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/bootcache/bootcache-0.0.1-r13.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/bootcache/bootcache-0.0.1-r13.ebuild
@@ -8,7 +8,7 @@ CROS_WORKON_TREE="933dc61ef690ca77ad5557123455b289bced1865"
 CROS_WORKON_PROJECT="chromiumos/platform/bootcache"
 CROS_WORKON_LOCALNAME="../platform/bootcache"
 CROS_WORKON_OUTOFTREE_BUILD=1
-inherit cros-workon
+inherit eutils cros-workon
 
 DESCRIPTION="Utility for creating store for boot cache"
 HOMEPAGE="http://git.chromium.org/gitweb/?s=bootcache"
@@ -21,6 +21,7 @@ IUSE=""
 
 src_prepare() {
 	cros-workon_src_prepare
+    epatch "${FILESDIR}/${P}-fix-fstack-protector.patch"
 }
 
 src_configure() {
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/bootcache/files/bootcache-0.0.1-fix-fstack-protector.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/bootcache/files/bootcache-0.0.1-fix-fstack-protector.patch
new file mode 100644
index 0000000000..c5edea7dfa
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/bootcache/files/bootcache-0.0.1-fix-fstack-protector.patch
@@ -0,0 +1,13 @@
+diff --git a/common.mk b/common.mk
+index 7533291..40d4f9d 100644
+--- a/common.mk
++++ b/common.mk
+@@ -276,7 +276,7 @@ endif
+ #  CXXFLAGS := -mahflag $(CXXFLAGS) # Prepend to the list
+ #  CXXFLAGS := $(filter-out badflag,$(CXXFLAGS)) # Filter out a value
+ # The same goes for CFLAGS.
+-COMMON_CFLAGS-gcc := -fstack-protector-strong -fvisibility=internal -ggdb3 \
++COMMON_CFLAGS-gcc := -fstack-protector-all -fvisibility=internal -ggdb3 \
+   -Wa,--noexecstack
+ COMMON_CFLAGS-clang := -fstack-protector-all -fvisibility=hidden -ggdb
+ COMMON_CFLAGS := -Wall -Werror -fno-strict-aliasing -O1