diff --git a/cpu/Makefile.include.cortexm_common b/cpu/Makefile.include.cortexm_common
index a31165af98..eb5f5030d3 100644
--- a/cpu/Makefile.include.cortexm_common
+++ b/cpu/Makefile.include.cortexm_common
@@ -41,10 +41,10 @@ export CFLAGS_OPT  ?= -Os
 
 export CFLAGS += $(CFLAGS_CPU) $(CFLAGS_LINK) $(CFLAGS_DBG) $(CFLAGS_OPT)
 
-export ASFLAGS += $(CFLAGS_CPU) $(CFLAGS_DEBUG)
+export ASFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG)
 export LINKFLAGS += -L$(RIOTCPU)/$(CPU)/ldscripts -L$(RIOTCPU)/cortexm_common/ldscripts
 export LINKFLAGS += -T$(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL).ld -Wl,--fatal-warnings
-export LINKFLAGS += $(CFLAGS_DEBUG) $(CFLAGS_CPU) -static -lgcc -nostartfiles
+export LINKFLAGS += $(CFLAGS_DBG) $(CFLAGS_CPU) -static -lgcc -nostartfiles
 export LINKFLAGS += -Wl,--gc-sections
 
 # This CPU implementation is using the new core/CPU interface:
diff --git a/cpu/Makefile.include.msp430_common b/cpu/Makefile.include.msp430_common
index c1de8401a6..0ba6f25214 100644
--- a/cpu/Makefile.include.msp430_common
+++ b/cpu/Makefile.include.msp430_common
@@ -9,7 +9,7 @@ CFLAGS_OPT  ?= -Os
 # export compiler flags
 export CFLAGS += $(CFLAGS_CPU) $(CFLAGS_LINK) $(CFLAGS_DBG) $(CFLAGS_OPT)
 # export assmebly flags
-export ASFLAGS += $(CFLAGS_CPU) --defsym $(CPU_MODEL)=1 $(CFLAGS_DEBUG)
+export ASFLAGS += $(CFLAGS_CPU) --defsym $(CPU_MODEL)=1 $(CFLAGS_DBG)
 # export linker flags
 export LINKFLAGS += $(CFLAGS_CPU) -lgcc