diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index 9030b8be..a6f3349f 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -3,7 +3,7 @@
 
 SCRIPT="${0#./}"
 BASE_DIR="${SCRIPT%/*}"
-WORKDIR=$PWD
+WORKDIR="$PWD"
 
 if [ "$BASE_DIR" = "$SCRIPT" ]; then
 	BASE_DIR="$WORKDIR"
diff --git a/libretro-build.sh b/libretro-build.sh
index 9505d3e5..3501b966 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -3,7 +3,7 @@
 
 SCRIPT="${0#./}"
 BASE_DIR="${SCRIPT%/*}"
-WORKDIR=$PWD
+WORKDIR="$PWD"
 
 if [ "$BASE_DIR" = "$SCRIPT" ]; then
 	BASE_DIR="$WORKDIR"
@@ -14,7 +14,7 @@ else
 	fi
 fi
 
-. ${BASE_DIR}/libretro-config.sh
+. "$BASE_DIR/libretro-config.sh"
 
 if [ -z "$RARCH_DIST_DIR" ]; then
 	RARCH_DIR="$WORKDIR/dist"
diff --git a/libretro-config.sh b/libretro-config.sh
index a9e85785..90ace695 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -230,7 +230,8 @@ if [[ "$FORMAT_COMPILER_TARGET" = "osx" && -z "$NOUNIVERSAL" ]]; then
 			export ARCHFLAGS="-arch ppc -arch ppc64"
 			;;
 		*)
-			echo "Universal build requested with unknown ARCH=\"$ARCH\""
+			echo "Will not build universal binaries for unknown ARCH=\"$ARCH\""
+			;;
 	esac
 fi
 
diff --git a/libretro-upgrade.sh b/libretro-upgrade.sh
new file mode 100755
index 00000000..2c62e40a
--- /dev/null
+++ b/libretro-upgrade.sh
@@ -0,0 +1,75 @@
+#! /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
+
+found_nothing=1
+
+libretro_move_libretro_common() {
+	if [ -f "$WORKDIR/libretro-sdk/file/config_file.c" ]; then
+		found_nothing=""
+		echo ""
+		echo "=== Detected old libretro-sdk (now libretro-common)"
+		if [ -d "$WORKDIR/libretro-common" ]; then
+			echo "    libretro-common already exists"
+			echo ""
+			echo -n "    Would you like to delete libretro-sdk? [y/N] : "
+			read user
+			if [[ "$user" = "y" || "$user" == "Y" ]]; then
+				echo "    Deleting libretro-sdk..."
+				rm -rf "$WORKDIR/libretro-sdk"
+			else
+				echo "Retaining libretro-sdk at your request."
+			fi
+		else
+			echo ""
+			echo "    will move it"
+			mv "$WORKDIR/libretro-sdk" "$WORKDIR/libretro-common"
+		fi
+	fi
+}
+
+libretro_bsnes_one_copy() {
+	if [ -d "$WORKDIR/libretro-bsnes/perf" ]; then
+		found_nothing=""
+		echo ""
+		echo "=== Detected bsnes duplicates"
+		echo "    libretro-super no longer needs three copies of bsnes"
+		echo ""
+		echo -n "    Would you like to delete the extras? [y/N] : "
+		read user
+		if [[ "$user" = "y" || "$user" == "Y" ]]; then
+			echo "    Deleting libretro-bsnes/balanced..."
+			rm -rf "$WORKDIR/libretro-bsnes/balanced"
+			echo "    Deleting libretro-bsnes/perf..."
+			rm -rf "$WORKDIR/libretro-bsnes/perf"
+		else
+			echo "    Retaining bsnes duplicates at your request."
+		fi
+fi
+}
+
+if [ -n "$1" ]; then
+	while [ -n "$1" ]; do
+		"$1"
+		shift
+	done
+else
+	libretro_move_libretro_common
+	libretro_bsnes_one_copy
+fi
+if [ -n "$found_nothing" ]; then
+	echo "Nothing to upgrade."
+fi
+