diff --git a/src/filescanner.c b/src/filescanner.c
index ff41ca11..db2fde84 100644
--- a/src/filescanner.c
+++ b/src/filescanner.c
@@ -384,7 +384,8 @@ process_media_file(char *file, time_t mtime, off_t size, int compilation, int ur
       if (extinf && extinf->found)
         {
 	  mfi.artist = strdup(extinf->artist);
-	  mfi.title = strdup(extinf->title);
+	  mfi.title = strdup(extinf->artist);
+	  mfi.album = strdup(extinf->title);
 	}
       ret = scan_metadata_icy(file, &mfi);
     }
diff --git a/src/filescanner_m3u.c b/src/filescanner_m3u.c
index af1c0b22..76c18e7a 100644
--- a/src/filescanner_m3u.c
+++ b/src/filescanner_m3u.c
@@ -210,7 +210,7 @@ scan_m3u_playlist(char *file, time_t mtime)
 	    }
 
 	  if (extinf.found)
-	    DPRINTF(E_INFO, L_SCAN, "Playlist has EXTINF, artist is %s, title is %s\n", extinf.artist, extinf.title);
+	    DPRINTF(E_INFO, L_SCAN, "Playlist has EXTINF metadata, artist is '%s', title is '%s'\n", extinf.artist, extinf.title);
 
 	  process_media_file(filename, mtime, 0, 0, 1, &extinf);
 	}