diff --git a/libretro-build-msvc2010_x86.sh b/libretro-build-msvc2010_x86.sh
new file mode 100755
index 00000000..72979435
--- /dev/null
+++ b/libretro-build-msvc2010_x86.sh
@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+# vim: set ts=3 sw=3 noet ft=sh : bash
+
+SCRIPT="${0#./}"
+BASE_DIR="${SCRIPT%/*}"
+WORKDIR="$PWD"
+
+if [ "$BASE_DIR" = "$SCRIPT" ]; then
+	BASE_DIR="$WORKDIR"
+else
+	if [[ "$0" != /* ]]; then
+		# Make the path absolute
+		BASE_DIR="$WORKDIR/$BASE_DIR"
+	fi
+fi
+
+platform=msvc2010_x86 ${BASE_DIR}/libretro-build.sh $@
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
deleted file mode 100644
index 7e5af520..00000000
--- a/libretro-build-win.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /usr/bin/env bash
-# vim: set ts=3 sw=3 noet ft=sh : bash
-
-BASE_DIR=$(pwd)
-RARCH_DIR=$BASE_DIR/dist
-RARCH_DIST_DIR=$RARCH_DIR/win
-FORMAT=_win
-FORMAT_EXT=dll
-MSVC_NAME=msvc-2010
-RELEASE_LTCG=Release
-RELEASE=Release
-
-die()
-{
-	echo $1
-	#exit 1
-}
-
-source $BASE_DIR/libretro-build-common-xdk.sh
-
-if [ $1 ]; then
-	$1
-else
-	#build_libretro_beetle_lynx
-	build_libretro_beetle_gba
-	build_libretro_beetle_ngp
-	build_libretro_beetle_pce_fast
-	build_libretro_beetle_supergrafx
-	build_libretro_beetle_pcfx
-	build_libretro_mednafen_psx
-	build_libretro_beetle_vb
-	build_libretro_beetle_wswan
-	#build_libretro_beetle_bsnes
-	build_libretro_snes9x
-	build_libretro_snes9x2010
-	build_libretro_genesis_plus_gx
-	#build_libretro_fbalpha
-	build_libretro_vba_next
-	build_libretro_fceumm
-	build_libretro_gambatte
-	build_libretro_nx
-	build_libretro_prboom
-	build_libretro_stella
-	#build_libretro_quicknes
-	build_libretro_nestopia
-	build_libretro_tyrquake
-	build_libretro_mame078
-	build_libretro_picodrive
-	#build_libretro_handy
-fi
diff --git a/libretro-config.sh b/libretro-config.sh
index 7a13f5b4..c13169aa 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -614,6 +614,13 @@ case "$platform" in
 							;;
 					esac
 					;;
+				msvc2010_x86)
+					platform=windows_msvc2010_x86
+					FORMAT_EXT="dll"
+					BINARY_EXT=".exe"
+					FORMAT_COMPILER_TARGET="windows_msvc2010_x86"
+					DIST_DIR="msvc2010_x86"
+					;;
 				win|*mingw32*|*MINGW32*|*MSYS_NT*)
 					platform=win
 					FORMAT_EXT="dll"