diff --git a/[refs] b/[refs]
index 7caa9fb9757b..6fef52fac83b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c07e02db76940c75fc92f2f2c9adcdbb09ed70d0
+refs/heads/master: c196eff3060270f155343b63ef3d06f31ccfcd2e
diff --git a/trunk/scripts/kconfig/kxgettext.c b/trunk/scripts/kconfig/kxgettext.c
index 1c88d7c6d5a7..ad1cb9451a24 100644
--- a/trunk/scripts/kconfig/kxgettext.c
+++ b/trunk/scripts/kconfig/kxgettext.c
@@ -179,7 +179,11 @@ static void message__print_file_lineno(struct message *self)
 {
 	struct file_line *fl = self->files;
 
-	printf("\n#: %s:%d", fl->file, fl->lineno);
+	putchar('\n');
+	if (self->option != NULL)
+		printf("# %s:00000\n", self->option);
+
+	printf("#: %s:%d", fl->file, fl->lineno);
 	fl = fl->next;
 
 	while (fl != NULL) {
@@ -187,9 +191,6 @@ static void message__print_file_lineno(struct message *self)
 		fl = fl->next;
 	}
 
-	if (self->option != NULL)
-		printf(", %s:00000", self->option);
-
 	putchar('\n');
 }