diff --git a/scripts/installer.sh b/scripts/installer.sh
index 97167b9..194f53a 100755
--- a/scripts/installer.sh
+++ b/scripts/installer.sh
@@ -181,6 +181,9 @@ function buildMacOSXSDK() {
 
 function buildPCDepsM1Hack() {
 	local TARGET=$1
+	local FOLDER=$2
+	
+	pushd "${FOLDER}" &> /dev/null
 	
 	if [[ "${TARGET}" == "macosa64" ]]; then
 		[[ -f config.guess ]] && mv -f config.guess config.guess.joey
@@ -203,6 +206,8 @@ function buildPCDepsM1Hack() {
 		[[ -f config.sub.joey ]] && mv -f config.sub.joey config.sub
 		popd &> /dev/null
 	fi
+
+	popd &> /dev/null
 }
 
 
@@ -242,10 +247,10 @@ function buildPCDeps() {
 		git clone https://github.com/libsdl-org/SDL.git
 		pushd SDL &> /dev/null
 		git checkout 25f9ed87ff6947d9576fc9d79dee0784e638ac58
-		buildPCDepsM1Hack ${TARGET}
 		popd &> /dev/null
 	fi
 	if [[ ! -e "${PREFIX}/lib/libSDL2.a" ]]; then
+		buildPCDepsM1Hack ${TARGET} SDL
 		clearDepsBuild
 		pushd build &> /dev/null
 		../SDL/configure \
@@ -274,10 +279,10 @@ function buildPCDeps() {
 		autoheader
 		automake --force-missing --add-missing
 		autoconf
-		buildPCDepsM1Hack ${TARGET}
 		popd &> /dev/null
 	fi
 	if [[ ! -e "${PREFIX}/lib/libmodplug.a" ]]; then
+		buildPCDepsM1Hack ${TARGET} libmodplug
 		clearDepsBuild
 		pushd build &> /dev/null
 		../libmodplug/configure \
@@ -298,10 +303,10 @@ function buildPCDeps() {
 		git clone https://github.com/libsdl-org/SDL_mixer.git
 		pushd SDL_mixer &> /dev/null
 		git checkout da75a58c19de9fedea62724a5f7770cbbe39adf9
-		buildPCDepsM1Hack ${TARGET}
 		popd &> /dev/null
 	fi
 	if [[ ! -e "${PREFIX}/lib/libSDL2_mixer.a" ]]; then
+		buildPCDepsM1Hack ${TARGET} SDL_mixer
 		clearDepsBuild
 		pushd build &> /dev/null
 		MODPLUG_CFLAGS="-I${PREFIX}/include -DMODPLUG_STATIC" \
@@ -609,7 +614,7 @@ function installAmiga() {
 
 	#***TODO*** SDL & Friends
 
-	purple "Building JoeyLib"
+	purple "Building JoeyLib Amiga"
 	(source "${G_PARENT}/joeyDev.sh" && "${G_PARENT}/joeylib/joeylib/build.sh" amiga) &> /dev/null
 
 	#***TODO*** Needs emulator
@@ -877,7 +882,7 @@ function installIIgs() {
 
 	mkdir -p "${JOEY}/dist/IIgs"
 
-	purple "Building JoeyLib"
+	purple "Building JoeyLib IIgs"
 	(source "${G_PARENT}/joeyDev.sh" && "${G_PARENT}/joeylib/joeylib/build.sh" iigs) &> /dev/null
 
 	"${IIGS}/unmountORCA.sh"
@@ -1052,7 +1057,7 @@ function installST() {
 	configWrite
 	configRead
 
-	purple "Building JoeyLib"
+	purple "Building JoeyLib Atari ST"
 	(source "${G_PARENT}/joeyDev.sh" && "${G_PARENT}/joeylib/joeylib/build.sh" st) &> /dev/null
 }