diff --git a/wadsrc/static/filter/doom.id.doom1/after_iwad/sndinfo.txt b/wadsrc/static/filter/doom.id.doom1/after_iwad/sndinfo.txt
new file mode 100644
index 0000000000..0c30de958c
--- /dev/null
+++ b/wadsrc/static/filter/doom.id.doom1/after_iwad/sndinfo.txt
@@ -0,0 +1,9 @@
+$musicalias D_E4M1 D_E3M4
+$musicalias D_E4M2 D_E3M2
+$musicalias D_E4M3 D_E3M3
+$musicalias D_E4M4 D_E1M5
+$musicalias D_E4M5 D_E2M7
+$musicalias D_E4M6 D_E2M4
+$musicalias D_E4M7 D_E2M6
+$musicalias D_E4M8 D_E2M5
+$musicalias D_E4M9 D_E1M9
diff --git a/wadsrc/static/language.def b/wadsrc/static/language.def
index da8ddfb4a1..103d4d3a94 100644
--- a/wadsrc/static/language.def
+++ b/wadsrc/static/language.def
@@ -34,6 +34,15 @@ MUSIC_E3M6 = "e3m6";
 MUSIC_E3M7 = "e3m7";
 MUSIC_E3M8 = "e3m8";
 MUSIC_E3M9 = "e3m9";
+MUSIC_E4M1 = "e4m1";
+MUSIC_E4M2 = "e4m2";
+MUSIC_E4M3 = "e4m3";
+MUSIC_E4M4 = "e4m4";
+MUSIC_E4M5 = "e4m5";
+MUSIC_E4M6 = "e4m6";
+MUSIC_E4M7 = "e4m7";
+MUSIC_E4M8 = "e4m8";
+MUSIC_E4M9 = "e4m9";
 MUSIC_INTER = "inter";
 MUSIC_INTRO = "intro";
 MUSIC_BUNNY = "bunny";
diff --git a/wadsrc/static/mapinfo/doom1.txt b/wadsrc/static/mapinfo/doom1.txt
index 8d8be2295c..851171530f 100644
--- a/wadsrc/static/mapinfo/doom1.txt
+++ b/wadsrc/static/mapinfo/doom1.txt
@@ -408,7 +408,7 @@ map E4M1 lookup "HUSTR_E4M1"
 	sky1 = "SKY4"
 	cluster = 4
 	par = 165
-	music = "$MUSIC_E3M4"
+	music = "$MUSIC_E4M1"
 }
 
 map E4M2 lookup "HUSTR_E4M2"
@@ -420,7 +420,7 @@ map E4M2 lookup "HUSTR_E4M2"
 	sky1 = "SKY4"
 	cluster = 4
 	par = 255
-	music = "$MUSIC_E3M2"
+	music = "$MUSIC_E4M2"
 }
 
 map E4M3 lookup "HUSTR_E4M3"
@@ -432,7 +432,7 @@ map E4M3 lookup "HUSTR_E4M3"
 	sky1 = "SKY4"
 	cluster = 4
 	par = 135
-	music = "$MUSIC_E3M3"
+	music = "$MUSIC_E4M3"
 }
 
 map E4M4 lookup "HUSTR_E4M4"
@@ -444,7 +444,7 @@ map E4M4 lookup "HUSTR_E4M4"
 	sky1 = "SKY4"
 	cluster = 4
 	par = 150
-	music = "$MUSIC_E1M5"
+	music = "$MUSIC_E4M4"
 }
 
 map E4M5 lookup "HUSTR_E4M5"
@@ -456,7 +456,7 @@ map E4M5 lookup "HUSTR_E4M5"
 	sky1 = "SKY4"
 	cluster = 4
 	par = 180
-	music = "$MUSIC_E2M7"
+	music = "$MUSIC_E4M5"
 }
 
 map E4M6 lookup "HUSTR_E4M6"
@@ -470,7 +470,7 @@ map E4M6 lookup "HUSTR_E4M6"
 	par = 390
 	e4m6special
 	specialaction_opendoor
-	music = "$MUSIC_E2M4"
+	music = "$MUSIC_E4M6"
 }
 
 map E4M7 lookup "HUSTR_E4M7"
@@ -482,7 +482,7 @@ map E4M7 lookup "HUSTR_E4M7"
 	sky1 = "SKY4"
 	cluster = 4
 	par = 135
-	music = "$MUSIC_E2M6"
+	music = "$MUSIC_E4M7"
 }
 
 map E4M8 lookup "HUSTR_E4M8"
@@ -498,7 +498,7 @@ map E4M8 lookup "HUSTR_E4M8"
 	nosoundclipping
 	e4m8special
 	specialaction_lowerfloor
-	music = "$MUSIC_E2M5"
+	music = "$MUSIC_E4M8"
 	needclustertext
 }
 
@@ -511,7 +511,7 @@ map E4M9 lookup "HUSTR_E4M9"
 	sky1 = "SKY4"
 	cluster = 4
 	par = 180
-	music = "$MUSIC_E1M9"
+	music = "$MUSIC_E4M9"
 }
 
 // Clusters (correspond with same-numbered episode)