--- scripts/kconfig/mconf.c
+++ scripts/kconfig/mconf.c
@@ -509,7 +509,7 @@
 			case P_COMMENT:
 				if (prompt) {
 					child_count++;
-					item_make("---%*c%s", indent + 1, ' ', _(prompt));
+					item_make("%s%*c%s", (prompt[0] != ' ' ? "---" : "  "), indent + 1, ' ', _(prompt));
 					item_set_tag(':');
 					item_set_data(menu);
 				}
--- scripts/kconfig/menu.c
+++ scripts/kconfig/menu.c
@@ -133,11 +133,13 @@
 	prop->visible.expr = menu_check_dep(dep);
 
 	if (prompt) {
+	    if (type != P_COMMENT) { // allow leading whitespaces for comments, makes multiline comments possible
 		if (isspace(*prompt)) {
 			prop_warn(prop, "leading whitespace ignored");
 			while (isspace(*prompt))
 				prompt++;
 		}
+	    }
 		if (current_entry->prompt && current_entry != &rootmenu)
 			prop_warn(prop, "prompt redefined");