diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 0dbb5b47ebb6..2493a03da33b 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -2158,8 +2158,12 @@ config IO_STRICT_DEVMEM
 
 	  If in doubt, say Y.
 
+menu "$(SRCARCH) Debugging"
+
 source "arch/$(SRCARCH)/Kconfig.debug"
 
+endmenu
+
 config HYPERV_TESTING
 	bool "Microsoft Hyper-V driver testing"
 	default n