diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild
index 3c231f54fd..814ad29540 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/cros_boot_mode-0.0.1-r16.ebuild
@@ -7,7 +7,7 @@ CROS_WORKON_TREE="b21faacf6a9940571ef122363c19a1ac02595b4b"
 CROS_WORKON_PROJECT="chromiumos/platform/cros_boot_mode"
 CROS_WORKON_OUTOFTREE_BUILD=1
 
-inherit toolchain-funcs cros-debug cros-workon
+inherit eutils toolchain-funcs cros-debug cros-workon
 
 DESCRIPTION="Chrome OS platform boot mode utility"
 HOMEPAGE="http://www.chromium.org/"
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 
 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/coreos-base/cros_boot_mode/files/cros_boot_mode-0.0.1-fix-fstack-protector.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/files/cros_boot_mode-0.0.1-fix-fstack-protector.patch
new file mode 100644
index 0000000000..e7cf377273
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros_boot_mode/files/cros_boot_mode-0.0.1-fix-fstack-protector.patch
@@ -0,0 +1,13 @@
+diff --git a/common.mk b/common.mk
+index 357d1f9..9a91c43 100644
+--- a/common.mk
++++ b/common.mk
+@@ -260,7 +260,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 := -Wall -Werror -fstack-protector-strong -fno-strict-aliasing \
++COMMON_CFLAGS := -Wall -Werror -fstack-protector-all -fno-strict-aliasing \
+   -ggdb3 -Wa,--noexecstack -O1 -fvisibility=internal -Wformat=2
+ CXXFLAGS += $(COMMON_CFLAGS)
+ CFLAGS += $(COMMON_CFLAGS)