diff --git a/Kconfig b/Kconfig
index 936181a9cb..97da1f01f5 100644
--- a/Kconfig
+++ b/Kconfig
@@ -27,7 +27,10 @@ choice OPTIMIZATION_LEVEL
     prompt "Optimization level"
     default OPTIMIZATION_LEVEL_DEBUG
     help
-        This option sets compiler optimization level.
+        This option sets optimization level.
+        For "Release" setting, -Os flag is added to CFLAGS,
+         and -DNDEBUG flag is added to CPPFLAGS.
+        For "Debug" setting, -Og flag is added to CFLAGS.
 config OPTIMIZATION_LEVEL_DEBUG
     bool "Debug"
 config OPTIMIZATION_LEVEL_RELEASE
diff --git a/make/project.mk b/make/project.mk
index 9088eda85d..b646dfc419 100644
--- a/make/project.mk
+++ b/make/project.mk
@@ -179,7 +179,7 @@ ifneq ("$(CONFIG_OPTIMIZATION_LEVEL_RELEASE)","")
 OPTIMIZATION_FLAGS = -Os
 CPPFLAGS += -DNDEBUG
 else
-OPTIMIZATION_FLAGS = -O0
+OPTIMIZATION_FLAGS = -Og
 endif
 
 # Enable generation of debugging symbols