diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
deleted file mode 100644
index 0f1cb5df..00000000
--- a/libretro-build-common-xdk.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-# vim: set ts=3 sw=3 noet ft=sh : bash
-
-die()
-{
-	echo $1
-	#exit 1
-}
-
-# $1 is corename
-# $2 subdir. If there is no subdir, input "." here
-# $3 build configuration - ie. release or release_ltcg
-build_libretro_generic_makefile() {
-	cd "$BASE_DIR"
-	if [ -d "libretro-${1}" ]; then
-		echo "=== Building ${1} ==="
-		cd libretro-${1}
-		cd ${2}
-		cd msvc
-		cmd.exe /k $MSVC_NAME.bat
-		cp $MSVC_NAME/${3}/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/${1}_libretro$FORMAT.$FORMAT_EXT
-	else
-		echo "${1} not fetched, skipping ..."
-	fi
-}
-
-build_libretro_beetle_bsnes() {
-	build_libretro_generic_makefile "mednafen_snes" "." $RELEASE_LTCG
-}
-
-build_libretro_beetle_lynx() {
-	build_libretro_generic_makefile "mednafen_lynx" "." $RELEASE_LTCG
-}
-
-build_libretro_beetle_wswan() {
-	build_libretro_generic_makefile "mednafen_wswan" "." $RELEASE_LTCG
-}
-
-build_libretro_beetle_gba() {
-	build_libretro_generic_makefile "mednafen_gba" "." $RELEASE_LTCG
-}
-
-build_libretro_beetle_ngp() {
-	build_libretro_generic_makefile "mednafen_ngp" "." $RELEASE_LTCG
-}
-
-build_libretro_beetle_pce_fast() {
-	build_libretro_generic_makefile "mednafen_pce_fast" "." $RELEASE_LTCG
-}
-
-build_libretro_beetle_supergrafx() {
-	build_libretro_generic_makefile "mednafen_supergrafx" "." $RELEASE_LTCG
-}
-
-build_libretro_beetle_pcfx() {
-	build_libretro_generic_makefile "mednafen_pcfx" "." $RELEASE_LTCG
-}
-
-build_libretro_beetle_vb() {
-	build_libretro_generic_makefile "mednafen_vb" "." $RELEASE_LTCG
-}
-
-build_libretro_snes9x() {
-	build_libretro_generic_makefile "snes9x" "libretro" $RELEASE_LTCG
-}
-
-build_libretro_s9x_next() {
-	build_libretro_generic_makefile "snes9x_next" "libretro" $RELEASE_LTCG
-}
-
-build_libretro_genesis_plus_gx() {
-	build_libretro_generic_makefile "genesis_plus_gx" "libretro" $RELEASE_LTCG
-}
-
-build_libretro_vba_next() {
-	build_libretro_generic_makefile "genesis_plus_gx" "libretro" $RELEASE
-}
-
-build_libretro_mame078() {
-	build_libretro_generic_makefile "mame078" "libretro" $RELEASE
-}
-
-build_libretro_fceumm() {
-	build_libretro_generic_makefile "fceumm" "src/drivers/libretro" $RELEASE_LTCG
-}
-
-build_libretro_gambatte()
-{
-	build_libretro_generic_makefile "gambatte" "libgambatte/libretro" $RELEASE_LTCG
-}
-
-build_libretro_nx() {
-	build_libretro_generic_makefile "nxengine" "nxengine-1.0.0.4/libretro" $RELEASE_LTCG
-}
-
-build_libretro_prboom() {
-	build_libretro_generic_makefile "prboom" "libretro" $RELEASE_LTCG
-}
-
-build_libretro_stella() {
-	build_libretro_generic_makefile "stella" "." $RELEASE_LTCG
-}
-
-build_libretro_picodrive() {
-	build_libretro_generic_makefile "picodrive" "platform/libretro" $RELEASE_LTCG
-}
-
-build_libretro_nestopia() {
-	build_libretro_generic_makefile "nestopia" "libretro" $RELEASE_LTCG
-}
-
-build_libretro_tyrquake() {
-	build_libretro_generic_makefile "tyrquake" "libretro" $RELEASE_LTCG
-}
-
-create_dist_dir()
-{
-	if [ -d $RARCH_DIR ]; then
-		echo "Directory $RARCH_DIR already exists, skipping creation..."
-	else
-		mkdir $RARCH_DIR
-	fi
-
-	if [ -d $RARCH_DIST_DIR ]; then
-		echo "Directory $RARCH_DIST_DIR already exists, skipping creation..."
-	else
-		mkdir $RARCH_DIST_DIR
-	fi
-}
-
-create_dist_dir
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index e0a0bd9d..3c00b424 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -1,77 +1,17 @@
 #! /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/xdk360
-FORMAT=_xdk360
-FORMAT_EXT=lib
-MSVC_NAME=msvc-2010-360
-RELEASE_LTCG=Release_LTCG
-RELEASE=Release
+SCRIPT="${0#./}"
+BASE_DIR="${SCRIPT%/*}"
+WORKDIR="$PWD"
 
-die()
-{
-	echo $1
-	#exit 1
-}
-
-build_libretro_fba()
-{
-	cd $BASE_DIR
-	if [ -d "libretro-fbalpha2012" ]; then
-		echo "=== Building Final Burn Alpha ==="
-		cd libretro-fbalpha2012/
-		cd svn-current/trunk
-		cd projectfiles/visualstudio-2010-libretro-360
-		cmd.exe /k $MSVC_NAME.bat
-		cp $RELEASE_LTCG/fbalpha2012_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR
-	else
-		echo "Final Burn Alpha not fetched, skipping ..."
-	fi
-}
-
-source $BASE_DIR/libretro-build-common-xdk.sh
-
-if [ $1 ]; then
-	$1
+if [ "$BASE_DIR" = "$SCRIPT" ]; then
+	BASE_DIR="$WORKDIR"
 else
-	# 2048 - not tested yet - could be endian unsafe
-	#build_libretro_2048
-	# 4DO - not tested yet - could be endian unsafe
-	#build_libretro_4do
-	#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_snes9x2010
-	build_libretro_snes9x
-	build_libretro_genesis_plus_gx
-	#build_libretro_fb_alpha
-	build_libretro_vba_next
-	build_libretro_fceumm
-	build_libretro_gambatte
-	build_libretro_nx
-	# O2EM - not tested yet - could be endian unsafe
-	#build_libretro_o2em
-	# PocketCDG - not tested yet - could be endian unsafe
-	#build_libretro_pocketcdg
-	# PokeMini - not tested yet - could be endian unsafe
-	#build_libretro_pokemini
-	# Prosystem - not tested yet - could be endian unsafe
-	#build_libretro_prosystem
-	build_libretro_prboom
-	build_libretro_stella
-	build_libretro_quicknes
-	build_libretro_nestopia
-	#build_libretro_tyrquake
-	#build_libretro_mame078
-	# Vecx - not tested yet - could be endian unsafe
-	#build_libretro_vecx
+	if [[ "$0" != /* ]]; then
+		# Make the path absolute
+		BASE_DIR="$WORKDIR/$BASE_DIR"
+	fi
 fi
+
+platform=xbox360 ${BASE_DIR}/libretro-build.sh $@
diff --git a/libretro-config.sh b/libretro-config.sh
index 86ca79ab..35173e6c 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -531,6 +531,15 @@ case "$platform" in
 		AR="$DEVKITPPC/bin/powerpc-eabi-ar$BINARY_EXT"
 		;;
 
+	xbox360)
+		DIST_DIR="xbox360"
+		FORMAT_EXT=a
+		FORMAT_COMPILER_TARGET=xbox360_msvc2010
+		FORMAT_COMPILER_TARGET_ALT=xbox360_msvc2010
+		FORMAT=_xdk360
+
+		;;
+
 	wiiu)
 		DIST_DIR="wiiu"
 		FORMAT_EXT=a