diff --git a/wadsrc/static/mapinfo/doom2xbox.txt b/wadsrc/static/mapinfo/doom2xbox.txt
new file mode 100644
index 000000000..50321440d
--- /dev/null
+++ b/wadsrc/static/mapinfo/doom2xbox.txt
@@ -0,0 +1,40 @@
+// MAPINFO for Doom 2: XBox Edition
+include "mapinfo/doom2.txt"
+
+clearepisodes
+episode map01
+{
+	name = "Hell On Earth"
+	picname = "M_EPI1"
+	key = "h"
+}
+
+episode level01
+{
+	name = "No Rest for the Living"
+	picname = "M_EPI2"
+	key = "n"
+	optional
+}
+
+map MAP02 lookup "HUSTR_2"
+{
+	titlepatch = "CWILV01"
+	next = "MAP03"
+	secretnext = "MAP33"
+	sky1 = "SKY1"
+	cluster = 5
+	par = 90
+	music = "$MUSIC_STALKS"
+}
+
+map MAP33 lookup "HUSTR_33"
+{
+	titlepatch = "CWILV32"
+	next = "MAP03"
+	secretnext = "MAP03"
+	sky1 = "SKY3"
+	cluster = 5
+	music = "$MUSIC_READ_M"
+}
+
diff --git a/wadsrc/static/mapinfo/doomxbox.txt b/wadsrc/static/mapinfo/doomxbox.txt
new file mode 100644
index 000000000..2244eceae
--- /dev/null
+++ b/wadsrc/static/mapinfo/doomxbox.txt
@@ -0,0 +1,25 @@
+// MAPINFO for Doom: XBox Edition
+include "mapinfo/ultdoom.txt"
+
+map E1M1 lookup "HUSTR_E1M1"
+{
+	levelnum = 1
+	titlepatch = "WILV00"
+	next = "E1M2"
+	secretnext = "E1M10"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 30
+	music = "$MUSIC_E1M1"
+}
+
+map E1M10 lookup "HUSTR_E1M10"
+{
+	titlepatch = "SEWERS"
+	next = "E1M2"
+	secretnext = "E1M2"
+	sky1 = "SKY1"
+	cluster = 1
+	music = "$MUSIC_E2M1"
+}
+
diff --git a/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi1.png b/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi1.png
new file mode 100644
index 000000000..bf057b942
Binary files /dev/null and b/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi1.png differ
diff --git a/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi2.png b/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi2.png
new file mode 100644
index 000000000..d0e1bfe02
Binary files /dev/null and b/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_epi2.png differ
diff --git a/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_episod.png b/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_episod.png
new file mode 100644
index 000000000..a62c58c5f
Binary files /dev/null and b/wadsrc_extra/static/filter/doom.id.doom2.commercial.xbox/graphics/m_episod.png differ
diff --git a/wadsrc_extra/static/iwadinfo.txt b/wadsrc_extra/static/iwadinfo.txt
index f9c1679bc..1e500e1a3 100644
--- a/wadsrc_extra/static/iwadinfo.txt
+++ b/wadsrc_extra/static/iwadinfo.txt
@@ -364,6 +364,22 @@ IWad
 	IgnoreTitlePatches = 1
 }
 
+IWad
+{
+	Name = "DOOM: XBox Edition"
+	Autoname = "doom.id.doom1.ultimate.xbox"
+	Game = "Doom"
+	Config = "Doom"
+	IWADName = "doom.wad"
+	Mapinfo = "mapinfo/doomxbox.txt"
+	Compatibility = "Shorttex"
+	MustContain = "E1M1","E2M1","E2M2","E2M3","E2M4","E2M5","E2M6","E2M7","E2M8","E2M9",
+		          "E3M1","E3M2","E3M3","E3M4","E3M5","E3M6","E3M7","E3M8","E3M9",
+		          "DPHOOF","BFGGA0","HEADA1","CYBRA1","SPIDA1D1", "E4M2", "E1M10", "SEWERS"
+	BannerColors = "18 18 18", "a8 a8 a8"
+	IgnoreTitlePatches = 1
+}
+
 IWad
 {
 	Name = "The Ultimate DOOM"
@@ -493,6 +509,22 @@ IWad
 	IgnoreTitlePatches = 1
 }
 
+IWad
+{
+	Name = "DOOM 2: XBox Edition"
+	Autoname = "doom.id.doom2.commercial.xbox"
+	Game = "Doom"
+	Config = "Doom"
+	IWADName = "doom2.wad", 1
+	Mapinfo = "mapinfo/doom2xbox.txt"
+	Compatibility = "Shorttex"
+	MustContain = "MAP01", "MAP33", "CWILV32"
+	BannerColors = "18 18 18", "a8 a8 a8"
+	IgnoreTitlePatches = 1
+	Load = "NERVE.WAD"
+	DeleteLumps = "M_EPI1", "M_EPI2", "M_EPISOD"
+}
+
 // Doom 2 must be last to be checked because MAP01 is its only requirement
 IWad
 {
@@ -522,6 +554,8 @@ Names
 	"doom2bfg.wad"
 	"bfgdoom.wad"
 	"doombfg.wad"
+	"doomxbox.wad"
+	"doom2xbox.wad"
 	"doomunity.wad"
 	"doom2unity.wad"
 	"doom2f.wad"
@@ -567,6 +601,8 @@ Order	// Order in the IWAD selection box
 	"DOOM Shareware"
 	"DOOM 2: BFG Edition"
 	"DOOM: BFG Edition"
+	"DOOM: XBox Edition"
+	"DOOM 2: XBox Edition"
 	"DOOM: Unity Edition"
 	"DOOM 2: Unity Edition"
 	"Final Doom: Plutonia Experiment: Unity Edition"