diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index f1e6c10b..53b2e284 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -274,6 +274,8 @@ COMPILE_DEBUG_CODE             ?= true
 #COMPILE_DEBUG_LOG              ?= true
 USE_COMPILER_DEBUG_OPTS        ?= true
 #USE_COMPILER_OPTIMIZATION_OPTS ?= true
+USE_STACK_PROTECTOR            ?= true
+#USE_STACK_CHECKER              ?= true
 
 #USE_FUSE                       ?= true
 #USE_SNDFILE                    ?= true
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 68a10ea3..24de205e 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -273,7 +273,9 @@ LOG_THREAD_NAMES               ?= true
 #COMPILE_DEBUG_CODE             ?= true
 #COMPILE_DEBUG_LOG              ?= true
 USE_COMPILER_DEBUG_OPTS        ?= true
-#USE_COMPILER_OPTIMIZATION_OPTS ?= true
+USE_COMPILER_OPTIMIZATION_OPTS ?= true
+USE_STACK_PROTECTOR            ?= true
+#USE_STACK_CHECKER              ?= true
 
 #USE_FUSE                       ?= true
 #USE_SNDFILE                    ?= true
diff --git a/make/defs.mk b/make/defs.mk
index 5556e4ea..a8a1eb14 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -841,8 +841,19 @@ ifeq ($(USE_MCHECK),true)
 endif
 
 ifeq ($(USE_STACK_PROTECTOR),true)
-	BUILD_CFLAGS+= -fstack-protector-all
-#	BUILD_CFLAGS+= -fstack-protector
+	BUILD_CFLAGS    += -fstack-protector-all
+	BUILD_CPPFLAGS  += -fstack-protector-all
+#	BUILD_CFLAGS    += -fstack-protector
+endif
+
+ifeq ($(USE_STACK_CHECKER),true)
+  ifeq "$(COMPILER_SUITE)" "clang"
+	BUILD_CFLAGS    += -fsanitize=address -fno-omit-frame-pointer
+	BUILD_CPPFLAGS  += -fsanitize=address -fno-omit-frame-pointer
+	BUILD_LDFLAGS   += -fsanitize=address
+  else
+  endif
+
 endif
 
 ifeq ($(USE_DBMALLOC),true)