diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index 6ae464f9..e16a4bfd 100644
--- a/libretro-build-common-xdk.sh
+++ b/libretro-build-common-xdk.sh
@@ -36,6 +36,20 @@ build_libretro_mednafen()
    fi
 }
 
+build_libretro_s9x()
+{
+   cd $BASE_DIR
+   if [ -d "libretro-s9x" ]; then
+      echo "=== Building SNES9x ==="
+      cd libretro-s9x/
+      cd libretro/msvc
+      cmd.exe /k $MSVC_NAME.bat
+      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/snes9x_libretro$FORMAT.$FORMAT_EXT
+   else
+      echo "SNES9x not fetched, skipping ..."
+   fi
+}
+
 build_libretro_s9x_next()
 {
    cd $BASE_DIR
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
index 5d20a5fd..e7048246 100644
--- a/libretro-build-win.sh
+++ b/libretro-build-win.sh
@@ -21,6 +21,7 @@ if [ $1 ]; then
    $1
 else
    #build_libretro_mednafen
+   build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
    #build_libretro_fba