diff --git a/changelog b/changelog
index 0b169e2ca5e..026f1395570 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,9 @@ Version 1.11.4+dev:
    * Added notification support for Windows
    * Made it so that the "Back to Turn X" and "Back to Start" menu items work
      with .bz2 saves
+ * Miscellaneous and bug fixes
+   * Added a new playlist FULL_MUSIC_PLAYLIST, which contains all Wesnoth tracks
+     in alphabetical order
 
 Version 1.11.4:
  * AI:
diff --git a/data/core/macros/sound-utils.cfg b/data/core/macros/sound-utils.cfg
index 20238d32505..8d701c4ad49 100644
--- a/data/core/macros/sound-utils.cfg
+++ b/data/core/macros/sound-utils.cfg
@@ -273,6 +273,345 @@
     [/event]
 #enddef
 
+#define FULL_MUSIC_PLAYLIST
+    # A macro to define a playlist of all tracks in alphabetical order.  The
+    # music is defined twice to catch instances where music is changed in
+    # a story and not set back
+    [music]
+        name=battle-epic.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=battle.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=breaking_the_chains.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=casualties_of_war.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=elf-land.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=elvish-theme.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=frantic.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=heroes_rite.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=into_the_shadows.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=journeys_end.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=knalgan_theme.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=knolls.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=legends_of_the_north.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=love_theme.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=loyalists.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=northern_mountains.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=northerners.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=nunc_dimittis.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=revelation.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=sad.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=siege_of_laurelmor.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=silvan_sanctuary.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=suspense.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=the_city_falls.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=the_dangerous_symphony.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=the_deep_path.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=the_king_is_dead.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=transience.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=traveling_minstrels.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=underground.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=vengeful.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=wanderer.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [music]
+        name=weight_of_revenge.ogg
+        ms_before=12000
+        append=yes
+    [/music]
+    [event]
+        name=prestart
+        [music]
+            name=battle-epic.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=battle.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=breaking_the_chains.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=casualties_of_war.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=elf-land.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=elvish-theme.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=frantic.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=heroes_rite.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=into_the_shadows.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=journeys_end.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=knalgan_theme.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=knolls.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=legends_of_the_north.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=love_theme.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=loyalists.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=northern_mountains.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=northerners.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=nunc_dimittis.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=revelation.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=sad.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=siege_of_laurelmor.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=silvan_sanctuary.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=suspense.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=the_city_falls.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=the_dangerous_symphony.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=the_deep_path.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=the_king_is_dead.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=transience.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=traveling_minstrels.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=underground.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=vengeful.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=wanderer.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+        [music]
+            name=weight_of_revenge.ogg
+            ms_before=12000
+            append=yes
+        [/music]
+    [/event]
+#enddef
+
 #define SCENARIO_MUSIC MUSIC
     # This music macro ensures that the correct music is selected
     # for a scenario just in case it is changed by [story].