diff --git a/Makefile b/Makefile
index 6be2cb2..1062d37 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 CC=gcc
 LD=ld
 CFLAGS  = -Wall -nostdinc -ffreestanding -DKERNEL_SOS -m32	\
-	  -fno-asynchronous-unwind-tables
+	  -fno-asynchronous-unwind-tables -fno-stack-protector
 LIBGCC := $(shell $(CC) -print-libgcc-file-name -m32) # To benefit from FP/64bits artihm.
 LDFLAGS = --warn-common -nostdlib -m elf_i386
 OBJECTS = bootstrap/multiboot.o					\
diff --git a/userland/Makefile b/userland/Makefile
index b560a39..3de4d8a 100644
--- a/userland/Makefile
+++ b/userland/Makefile
@@ -18,7 +18,7 @@
 CC=gcc
 AR=ar
 OBJCOPY=objcopy
-CFLAGS  = -Wall -nostdinc -ffreestanding -I. -I.. -m32 -fno-asynchronous-unwind-tables
+CFLAGS  = -Wall -nostdinc -ffreestanding -I. -I.. -m32 -fno-asynchronous-unwind-tables -fno-stack-protector
 LIBGCC := $(shell $(CC) -print-libgcc-file-name -m32) # To benefit from FP/64bits artihm.
 LDFLAGS = -Wl,--warn-common -nostdlib -Wl,-Tldscript.lds -m32 -fno-asynchronous-unwind-tables