diff --git a/apps/playlist.c b/apps/playlist.c
index 7b1ec5990a..2e21aef717 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -146,8 +146,16 @@ void add_indices_to_playlist( playlist_info_t *playlist )
             {
                 store_index = 1;
             } 
+            else if((*p == '#') && store_index)
+            {
+                /* If the first character on a new line is a hash
+                   sign, we treat it as a comment. So called winamp
+                   style playlist. */
+                store_index = 0;
+            }
             else if(store_index) 
             {
+
                 /* Store a new entry */
                 playlist->indices[ playlist->amount ] = i+count;
                 playlist->amount++;