diff --git a/.appveyor.yml b/.appveyor.yml
index fb8c450f..295d2820 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,6 +4,14 @@ environment:
   global:
     PLATFORMTOOLSET: "v140"
   matrix:
+    - BUILD_TYPE: Release
+      COMPILER: MSVC15
+      COMPILER_FAMILY: MSVC
+      GENERATOR: "Visual Studio 14 2015"
+      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
+      PLATFORM: Win32-SDL-2.0.9
+      PLATFORMTOOLSET: "v140_xp"
+      EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_HG_BRANCH=release-2.0.9 -DAUDIO_CODECS_SDL2_GIT_BRANCH=origin/release-2.0.9"
     - BUILD_TYPE: MinSizeRel
       COMPILER: MinGW-w32
       COMPILER_FAMILY: MinGW
diff --git a/cmake/DownloadAudioCodecs.cmake b/cmake/DownloadAudioCodecs.cmake
index e30e7fad..a69d7b56 100644
--- a/cmake/DownloadAudioCodecs.cmake
+++ b/cmake/DownloadAudioCodecs.cmake
@@ -17,11 +17,24 @@ find_package(Git REQUIRED)
 set(AUDIO_CODECS_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(AUDIO_CODECS_REPOSITORY_PATH ${CMAKE_BINARY_DIR}/external/AudioCodecs)
 
+#set(AUDIO_CODECS_REPO_PATH "" CACHE PATH "Path to the AudioCodecs dependencies pack")
+
+set(AUDIO_CODECS_SDL2_HG_BRANCH "" CACHE PATH "HG branch for SDL2 (official Mercurial mainstream repo)")
+set(AUDIO_CODECS_SDL2_GIT_BRANCH "" CACHE PATH "GIT branch for SDL2 (unofficial Git mirror)")
+
 option(WITH_SDL2_WASAPI "Enable WASAPI audio output support for Windows build of SDL2" ON)
 if(WIN32)
     set(SDL2_WASAPI_FLAG "-DSDL2_WASAPI_FLAG=${WITH_SDL2_WASAPI}")
 endif()
 
+set(SDL2_TAGS)
+if(AUDIO_CODECS_SDL2_HG_BRANCH)
+    set(SDL2_TAGS ${SDL2_TAGS} "-DSDL2_HG_BRANCH=${AUDIO_CODECS_SDL2_HG_BRANCH}")
+endif()
+if(AUDIO_CODECS_SDL2_GIT_BRANCH)
+    set(SDL2_TAGS ${SDL2_TAGS} "-DSDL2_GIT_BRANCH=${AUDIO_CODECS_SDL2_GIT_BRANCH}")
+endif()
+
 ExternalProject_Add(
     AudioCodecs
     PREFIX ${CMAKE_BINARY_DIR}/external/AudioCodecs
@@ -31,6 +44,7 @@ ExternalProject_Add(
         "-DCMAKE_INSTALL_PREFIX=${AUDIO_CODECS_INSTALL_DIR}"
         "-DDOWNLOAD_SDL2_DEPENDENCY=ON"
         ${SDL2_WASAPI_FLAG}
+        ${SDL2_TAGS}
 )
 
 message("AudioCodecs can see SDL2 is stored in ${SDL2_REPO_PATH}...")