diff --git a/NEWS b/NEWS
index 476553ff5..7723350ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 ver 0.15.9 (2009/??/??)
 * decoders:
   - mad: fix crash when seeking at end of song
+* playlist: fix single+repeat in random mode
 
 
 ver 0.15.8 (2010/01/17)
diff --git a/src/playlist.c b/src/playlist.c
index 35c09329a..660dd6a83 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -140,7 +140,8 @@ playlist_update_queued_song(struct playlist *playlist, const struct song *prev)
 		? queue_next_order(&playlist->queue, playlist->current)
 		: 0;
 
-	if (next_order == 0 && playlist->queue.random) {
+	if (next_order == 0 && playlist->queue.random &&
+	    !playlist->queue.single) {
 		/* shuffle the song order again, so we get a different
 		   order each time the playlist is played
 		   completely */