diff --git a/data/DataCache.scr b/data/DataCache.scr
index 477276a3c..fc9a71070 100644
--- a/data/DataCache.scr
+++ b/data/DataCache.scr
@@ -9,6 +9,9 @@ translations/eng.dat
 music/chapter1.pxm
 music/chapter1.vb
 music/chapter1.vh
+music/chapter2.pxm
+music/chapter2.vb
+music/chapter2.vh
 music/chapter3.pxm
 music/chapter3.vb
 music/chapter3.vh
diff --git a/data/Music/chapter2/CHAPTER2.PXM b/data/Music/chapter2/CHAPTER2.PXM
new file mode 100644
index 000000000..f2b669421
Binary files /dev/null and b/data/Music/chapter2/CHAPTER2.PXM differ
diff --git a/data/Music/chapter2/CHAPTER2.VB b/data/Music/chapter2/CHAPTER2.VB
new file mode 100644
index 000000000..2f97629d0
Binary files /dev/null and b/data/Music/chapter2/CHAPTER2.VB differ
diff --git a/data/Music/chapter2/CHAPTER2.VH b/data/Music/chapter2/CHAPTER2.VH
new file mode 100644
index 000000000..76375dc7f
Binary files /dev/null and b/data/Music/chapter2/CHAPTER2.VH differ
diff --git a/data/Music/chapter2/CHAPTER2.XM b/data/Music/chapter2/CHAPTER2.XM
new file mode 100644
index 000000000..2412f1560
Binary files /dev/null and b/data/Music/chapter2/CHAPTER2.XM differ
diff --git a/makefile.gfx b/makefile.gfx
index 19a62171b..d5bfb48b9 100644
--- a/makefile.gfx
+++ b/makefile.gfx
@@ -402,7 +402,7 @@ MUSIC_IN_DIR :=		data/music
 MUSIC_OUT_DIR :=	$(DATA_OUT)/music
 
 MUSIC_LIST :=		sb-title \
-					chapter1 chapter3
+					chapter1 chapter2 chapter3
 
 MUSIC_ALL_IN :=		$(foreach MUSIC,$(MUSIC_LIST),$(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).PXM $(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).VH $(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).VB)
 MUSIC_ALL_OUT :=	$(foreach MUSIC,$(MUSIC_LIST),$(MUSIC_OUT_DIR)/$(MUSIC).PXM $(MUSIC_OUT_DIR)/$(MUSIC).VH $(MUSIC_OUT_DIR)/$(MUSIC).VB)
diff --git a/source/sound/sound.cpp b/source/sound/sound.cpp
index fb5364350..f4ba88df3 100644
--- a/source/sound/sound.cpp
+++ b/source/sound/sound.cpp
@@ -105,12 +105,17 @@ static XMSONGDATA	s_xmSongData[CSoundMediator::NUM_SONGIDS]=
 	{	MUSIC_CHAPTER1_VH,		MUSIC_CHAPTER1_VB,		MUSIC_CHAPTER1_PXM,		0x00	},		// SONG_CHAPTER1_LEVEL3,
 	{	MUSIC_CHAPTER1_VH,		MUSIC_CHAPTER1_VB,		MUSIC_CHAPTER1_PXM,		0x2c	},		// SONG_CHAPTER1_LEVEL4,
 	{	MUSIC_CHAPTER1_VH,		MUSIC_CHAPTER1_VB,		MUSIC_CHAPTER1_PXM,		0x40	},		// SONG_CHAPTER1_BOSS,
-	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x18	},		// SONG_CHAPTER1_LEVEL1,
-	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x00	},		// SONG_CHAPTER1_LEVEL2,
-	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x00	},		// SONG_CHAPTER1_LEVEL3,
-	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x0b	},		// SONG_CHAPTER1_LEVEL4,
-	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x21	},		// SONG_CHAPTER1_BOSS_ASLEEP,
-	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x22	},		// SONG_CHAPTER1_BOSS_AWAKE,
+	{	MUSIC_CHAPTER2_VH,		MUSIC_CHAPTER2_VB,		MUSIC_CHAPTER2_PXM,		0x00	},		// SONG_CHAPTER2_LEVEL1,
+	{	MUSIC_CHAPTER2_VH,		MUSIC_CHAPTER2_VB,		MUSIC_CHAPTER2_PXM,		0x16	},		// SONG_CHAPTER2_LEVEL2,
+	{	MUSIC_CHAPTER2_VH,		MUSIC_CHAPTER2_VB,		MUSIC_CHAPTER2_PXM,		0x00	},		// SONG_CHAPTER2_LEVEL3,
+	{	MUSIC_CHAPTER2_VH,		MUSIC_CHAPTER2_VB,		MUSIC_CHAPTER2_PXM,		0x3e	},		// SONG_CHAPTER2_LEVEL4,
+	{	MUSIC_CHAPTER2_VH,		MUSIC_CHAPTER2_VB,		MUSIC_CHAPTER2_PXM,		0x40	},		// SONG_CHAPTER2_BOSS,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x18	},		// SONG_CHAPTER3_LEVEL1,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x00	},		// SONG_CHAPTER3_LEVEL2,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x00	},		// SONG_CHAPTER3_LEVEL3,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x0b	},		// SONG_CHAPTER3_LEVEL4,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x21	},		// SONG_CHAPTER3_BOSS_ASLEEP,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x22	},		// SONG_CHAPTER3_BOSS_AWAKE,
 };
 
 // SFX banks
diff --git a/source/sound/sound.h b/source/sound/sound.h
index fd9b4d462..2381452d8 100644
--- a/source/sound/sound.h
+++ b/source/sound/sound.h
@@ -59,6 +59,11 @@ public:
 		SONG_CHAPTER1_LEVEL3,
 		SONG_CHAPTER1_LEVEL4,
 		SONG_CHAPTER1_BOSS,
+		SONG_CHAPTER2_LEVEL1,
+		SONG_CHAPTER2_LEVEL2,
+		SONG_CHAPTER2_LEVEL3,
+		SONG_CHAPTER2_LEVEL4,
+		SONG_CHAPTER2_BOSS,
 		SONG_CHAPTER3_LEVEL1,
 		SONG_CHAPTER3_LEVEL2,
 		SONG_CHAPTER3_LEVEL3,