diff --git a/src/f_finale.c b/src/f_finale.c
index 466d8b0f4..0f1140061 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1388,10 +1388,13 @@ void F_StartGameEvaluation(void)
 	// Credits option in secrets menu
 	if (cursaveslot == -1)
 	{
+		S_FadeOutStopMusic(2*MUSICRATE);
 		F_StartGameEnd();
 		return;
 	}
 
+	S_FadeOutStopMusic(5*MUSICRATE);
+
 	G_SetGamestate(GS_EVALUATION);
 
 	// Just in case they're open ... somehow
@@ -1638,7 +1641,7 @@ void F_StartEnding(void)
 	gameaction = ga_nothing;
 	paused = false;
 	CON_ToggleOff();
-	S_StopMusic(); // todo: placeholder
+	S_StopMusic();
 	S_StopSounds();
 
 	finalecount = -10; // what? this totally isn't a hack. why are you asking?
@@ -1719,6 +1722,9 @@ void F_EndingTicker(void)
 		return;
 	}
 
+	if (finalecount == -8)
+		S_ChangeMusicInternal((goodending ? "_endg" : "_endb"), false);
+
 	if (goodending && finalecount == INFLECTIONPOINT) // time to swap some assets
 	{
 		endegrk[0] = W_CachePatchName("ENDEGRK2", PU_LEVEL);
@@ -2148,7 +2154,6 @@ void F_StartGameEnd(void)
 	gameaction = ga_nothing;
 	paused = false;
 	CON_ToggleOff();
-	S_StopMusic();
 	S_StopSounds();
 
 	// In case menus are still up?!!