diff --git a/NEWS b/NEWS
index 98f1ccd6c..acff1a48f 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@ ver 0.20 (not yet released)
   - ffmpeg: support ReplayGain and MixRamp
   - ffmpeg: support stream tags
   - mpcdec: read the bit rate
+* playlist
+  - embcue: fix last track
 * output
   - jack: reduce CPU usage
   - pulse: set channel map to WAVE-EX
diff --git a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
index 29b15b1de..e12dc2df0 100644
--- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
@@ -128,8 +128,10 @@ DetachedSong *
 EmbeddedCuePlaylist::NextSong()
 {
 	DetachedSong *song = parser->Get();
-	if (song != nullptr)
+	if (song != nullptr) {
+		song->SetURI(filename);
 		return song;
+	}
 
 	while (*next != 0) {
 		const char *line = next;