2 files changed, 9 insertions, 1 deletions

diff --git a/apps/wps-display.c b/apps/wps-display.c
index 2754dba8ad..c6621b1e62 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -113,6 +113,7 @@ char* wps_get_genre(unsigned int genre)
 static void wps_format(char* fmt)
 {
     char* buf = format_buffer;
+    char* start_of_line = format_buffer;
     int line = 0;
     
     strncpy(format_buffer, fmt, sizeof(format_buffer));
@@ -129,11 +130,15 @@ static void wps_format(char* fmt)
 
             case '\n': /* LF */
                 *buf = 0;
+
+                if(*start_of_line != '#') /* A comment? */
+                    line++;
                 
-                if (++line < MAX_LINES)
+                if (line <= MAX_LINES)
                 {
                     /* the next line starts on the next byte */
                     format_lines[line] = buf+1;
+                    start_of_line = format_lines[line];
                 }
                 break;
         }
diff --git a/docs/CUSTOM_WPS_FORMAT b/docs/CUSTOM_WPS_FORMAT
index 557402bc26..9a11c398cd 100644
--- a/docs/CUSTOM_WPS_FORMAT
+++ b/docs/CUSTOM_WPS_FORMAT
@@ -8,6 +8,7 @@ Description / General Info
 * After editing the .wps file, "play" it to make it take effect.
 * The file may be 2 lines long for the Player, and 10 lines for the Recorder.
 * All characters not preceded by % are displayed as typed.
+* A line beginning with # is a comment
 
 File Location
 -------------
@@ -100,11 +101,13 @@ Default
 If you haven't selected a .wps file in the .rockbox directory, you get the
 hardcoded wps layout. The default WPS screen is for player:
 
+# Default WPS for Player
 %s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d2> - %?id<%id|%d1>
 %pc%?ps<*|/>%pt
 
 and for recorder:
 
+# Default WPS for Recorder
 %s%?it<%?in<%in. |>%it|%fn>
 %s%?ia<%ia|%?d2<%d2|(root)>>
 %s%?id<%id|%?d1<%d1|(root)>> %?iy<(%iy)|>