diff --git a/cpu/cortexm_common/Makefile.dep b/cpu/cortexm_common/Makefile.dep
index 3b3c0bc9fe..472b903407 100644
--- a/cpu/cortexm_common/Makefile.dep
+++ b/cpu/cortexm_common/Makefile.dep
@@ -18,3 +18,8 @@ FEATURES_OPTIONAL += cortexm_fpu
 ifneq (,$(filter cortexm_fpu,$(FEATURES_USED)))
   DEFAULT_MODULE += cortexm_fpu
 endif
+
+# Enable the MPU stack guard if develhelp is enabled
+ifeq (1, $(DEVELHELP))
+  FEATURES_OPTIONAL += cortexm_mpu
+endif
diff --git a/makefiles/features_modules.inc.mk b/makefiles/features_modules.inc.mk
index 8a8bcbff76..4ff401c1a0 100644
--- a/makefiles/features_modules.inc.mk
+++ b/makefiles/features_modules.inc.mk
@@ -33,3 +33,8 @@ USEMODULE += $(filter cortexm_svc, $(FEATURES_USED))
 ifeq (, $(filter no_idle_thread, $(FEATURES_USED)))
   USEMODULE += core_idle_thread
 endif
+
+# use mpu_stack_guard if the feature is used
+ifneq (,$(filter cortexm_mpu,$(FEATURES_USED)))
+  USEMODULE += mpu_stack_guard
+endif