diff --git a/src/gamedata/fonts/v_font.cpp b/src/gamedata/fonts/v_font.cpp
index 71dd5a433..fb6d1f8d6 100644
--- a/src/gamedata/fonts/v_font.cpp
+++ b/src/gamedata/fonts/v_font.cpp
@@ -1583,11 +1583,17 @@ void V_InitFonts()
 
 	if (!(BigFont = V_GetFont("BigFont")))
 	{
-		if (gameinfo.gametype & GAME_Raven)
+		if (Wads.CheckNumForName("FONTB_S") >= 0)
 		{
 			BigFont = new FFont("BigFont", "FONTB%02u", "defbigfont", HU_FONTSTART, HU_FONTSIZE, 1, -1);
 		}
 	}
+	
+	if (!BigFont)
+	{
+		// Load the generic fallback if no BigFont is found.
+		BigFont = V_GetFont("BigFont", "ZBIGFONT");
+	}
 
 	if (gameinfo.gametype & GAME_Raven)
 	{
diff --git a/wadsrc/static/filter/game-doomstrifechex/bigfont.lmp b/wadsrc/static/zbigfont.lmp
similarity index 100%
rename from wadsrc/static/filter/game-doomstrifechex/bigfont.lmp
rename to wadsrc/static/zbigfont.lmp
diff --git a/wadsrc/static/filter/doom.freedoom/decaldef.z b/wadsrc_extra/static/filter/doom.freedoom/decaldef.z
similarity index 100%
rename from wadsrc/static/filter/doom.freedoom/decaldef.z
rename to wadsrc_extra/static/filter/doom.freedoom/decaldef.z
diff --git a/wadsrc/static/filter/doom.id/sprofs.txt b/wadsrc_extra/static/filter/doom.id/sprofs.txt
similarity index 100%
rename from wadsrc/static/filter/doom.id/sprofs.txt
rename to wadsrc_extra/static/filter/doom.id/sprofs.txt
diff --git a/wadsrc/static/filter/heretic/sprofs.txt b/wadsrc_extra/static/filter/heretic/sprofs.txt
similarity index 100%
rename from wadsrc/static/filter/heretic/sprofs.txt
rename to wadsrc_extra/static/filter/heretic/sprofs.txt
diff --git a/wadsrc/static/filter/hexen/sprofs.txt b/wadsrc_extra/static/filter/hexen/sprofs.txt
similarity index 100%
rename from wadsrc/static/filter/hexen/sprofs.txt
rename to wadsrc_extra/static/filter/hexen/sprofs.txt
diff --git a/wadsrc/static/filter/strife/sprofs.txt b/wadsrc_extra/static/filter/strife/sprofs.txt
similarity index 100%
rename from wadsrc/static/filter/strife/sprofs.txt
rename to wadsrc_extra/static/filter/strife/sprofs.txt
diff --git a/wadsrc/static/filter/strifeteaser1/mapinfo/conversationids.txt b/wadsrc_extra/static/filter/strifeteaser1/mapinfo.txt
similarity index 100%
rename from wadsrc/static/filter/strifeteaser1/mapinfo/conversationids.txt
rename to wadsrc_extra/static/filter/strifeteaser1/mapinfo.txt
diff --git a/wadsrc/static/filter/strifeteaser2/mapinfo/conversationids.txt b/wadsrc_extra/static/filter/strifeteaser2/mapinfo.txt
similarity index 100%
rename from wadsrc/static/filter/strifeteaser2/mapinfo/conversationids.txt
rename to wadsrc_extra/static/filter/strifeteaser2/mapinfo.txt