diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 581855f85..197963a66 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ D2X-Rebirth Changelog
 --------
 main/lighting.c: Since set_dynamic_light() is not necessarily processed each frame, added own counter for delayed precession of vertex-clight calculation; Added possibility to page in a bitmap in case an object which has never been rendered before is supposed to cast light visible by the player 
 main/digiobj.c, main/piggy.c: Don't force AltSounds on PC-Shareware content but still must bail out on missing sounds using a small hack. Still gives a better sound palette than AltSounds
+main/titles.c: Play SONG_BRIEFING and SONG_ENDGAME on all non-builtin missions if available
 
 20110601
 --------
diff --git a/main/titles.c b/main/titles.c
index 42f0e09ee..327f739bd 100644
--- a/main/titles.c
+++ b/main/titles.c
@@ -1401,7 +1401,7 @@ void do_briefing_screens(char *filename, int level_num)
 		return;
 	}
 
-	if (EMULATING_D1 || is_SHAREWARE || is_MAC_SHARE || is_D2_OEM)
+	if (EMULATING_D1 || is_SHAREWARE || is_MAC_SHARE || is_D2_OEM || !PLAYING_BUILTIN_MISSION)
 	{
 		if ((songs_is_playing() != SONG_BRIEFING) && (songs_is_playing() != SONG_ENDGAME))
 			songs_play_song( SONG_BRIEFING, 1 );
@@ -1468,6 +1468,7 @@ void do_end_briefing_screens(char *filename)
 	}
 	else
 	{
+		songs_play_song( SONG_ENDGAME, 1 );
 		level_num_screen = Last_level + 1;
 	}