diff --git a/Makefile.boardloader b/Makefile.boardloader
index 0f6f88fe6d..971e8ece82 100644
--- a/Makefile.boardloader
+++ b/Makefile.boardloader
@@ -106,7 +106,7 @@ INC += -I$(SRCDIR_MP)/lib/cmsis/inc
 INC += -I$(BUILD)
 
 ifeq ($(DEBUG), 1)
-CFLAGS += -Os -ggdb
+CFLAGS += -Os -g3
 else
 CFLAGS += -Os -DNDEBUG
 endif
diff --git a/Makefile.bootloader b/Makefile.bootloader
index ec312e36a0..4a889ed20d 100644
--- a/Makefile.bootloader
+++ b/Makefile.bootloader
@@ -120,7 +120,7 @@ INC += -I$(SRCDIR_MP)/lib/cmsis/inc
 INC += -I$(BUILD)
 
 ifeq ($(DEBUG), 1)
-CFLAGS += -Os -ggdb
+CFLAGS += -Os -g3
 else
 CFLAGS += -Os -DNDEBUG
 endif
diff --git a/Makefile.firmware b/Makefile.firmware
index fc981483d1..4d99314d31 100644
--- a/Makefile.firmware
+++ b/Makefile.firmware
@@ -363,7 +363,7 @@ INC += -I$(SRCDIR_MP)/lib/cmsis/inc
 INC += -I$(BUILD)
 
 ifeq ($(DEBUG), 1)
-CFLAGS += -Os -ggdb
+CFLAGS += -Os -g3
 else
 CFLAGS += -Os -DNDEBUG
 endif