diff --git a/Makefile b/Makefile
index e2fe97ddc4..9bb51c69b9 100644
--- a/Makefile
+++ b/Makefile
@@ -566,7 +566,11 @@ ifdef BUILD_TAG
 KBUILD_CFLAGS += -DBUILD_TAG='"$(BUILD_TAG)"'
 endif
 
-KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
+ifdef CONFIG_ARCH_IPQ807x
+KBUILD_CFLAGS += $(call cc-option,-fstack-protector)
+else
+KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
+endif
 KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks)
 
 KBUILD_CFLAGS	+= -g