diff --git a/NEWS b/NEWS
index 074b1ec17..0190d4cc5 100644
--- a/NEWS
+++ b/NEWS
@@ -44,6 +44,7 @@ ver 0.14.2 (2009/??/??)
   - jack: clear "shutdown" flag on reconnect
   - jack: reduced sleep time to 1ms
 * mapper: remove trailing slashes from music_directory
+* player: set player error when output device fails
 
 
 ver 0.14.1 (2009/01/17)
diff --git a/src/player_thread.c b/src/player_thread.c
index d150c4303..622eab072 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -268,8 +268,11 @@ play_chunk(struct song *song, struct music_chunk *chunk,
 	pcm_volume(chunk->data, chunk->length,
 		   format, pc.software_volume);
 
-	if (!playAudio(chunk->data, chunk->length))
+	if (!playAudio(chunk->data, chunk->length)) {
+		pc.errored_song = dc.current_song;
+		pc.error = PLAYER_ERROR_AUDIO;
 		return false;
+	}
 
 	pc.total_play_time += sizeToTime * chunk->length;
 	return true;