diff --git a/libretro-build-android.sh b/libretro-build-android.sh
index 7839b74a..19ec562c 100755
--- a/libretro-build-android.sh
+++ b/libretro-build-android.sh
@@ -1,328 +1,288 @@
 #!/bin/sh
 
-CORES_DIR=~/local-repos
-ROOT_DIR=$CORES_DIR/libretro-super
-RARCH_DIR=$CORES_DIR/RetroArch
-RARCH_DIST_DIR=$RARCH_DIR/dist-scripts
+SCRIPT=$(readlink -f $0)
+BASE_DIR=$(dirname $SCRIPT)
+RARCH_DIR=$BASE_DIR/dist
 JOBS=7
 
+echo $RARCH_DIR
+
 die()
 {
    echo $1
    #exit 1
 }
 
-MEDNAFEN_DIR_NAME=mednafen-libretro
-
 build_libretro_mednafen()
 {
-   cd $CORES_DIR
-   if [ -d "$MEDNAFEN_DIR_NAME" ]; then
+   cd $BASE_DIR
+   pwd
+   if [ -d "libretro-mednafen" ]; then
       echo "=== Building Mednafen ==="
-      cd $MEDNAFEN_DIR_NAME
+      cd libretro-mednafen
       cd jni
       ndk-build clean || die "Failed to clean mednafen_ngp"
       ndk-build core=ngp clean || die "Failed to clean mednafen_ngp"
       ndk-build core=ngp -j$JOBS || die "Failed to build mednafen_ngp"
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_mednafen_ngp.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_mednafen_ngp.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_mednafen_ngp.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_mednafen_ngp.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_mednafen_ngp.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_mednafen_ngp.so
 
       ndk-build clean || die "Failed to clean mednafen_wswan"
       ndk-build core=wswan clean || die "Failed to clean mednafen_wswan"
       ndk-build core=wswan -j$JOBS || die "Failed to build mednafen_wswan"
 
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_mednafen_wswan.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_mednafen_wswan.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_mednafen_wswan.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_mednafen_wswan.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_mednafen_wswan.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_mednafen_wswan.so
 
       ndk-build clean || die "Failed to clean mednafen_vb"
       ndk-build core=vb clean || die "Failed to clean mednafen_vb"
       ndk-build core=vb -j$JOBS || die "Failed to build mednafen_vb"
 
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_mednafen_vb.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_mednafen_vb.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_mednafen_vb.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_mednafen_vb.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_mednafen_vb.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_mednafen_vb.so
 
       ndk-build clean || die "Failed to clean mednafen_pce_fast"
       ndk-build core=pce-fast clean || die "Failed to clean mednafen_pce_fast"
       ndk-build core=pce-fast -j$JOBS || die "Failed to build mednafen_pce_fast"
 
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_mednafen_pce_fast.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_mednafen_pce_fast.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_mednafen_pce_fast.so
-
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_mednafen_pce_fast.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_mednafen_pce_fast.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_mednafen_pce_fast.so
    else
       echo "Mednafen not fetched, skipping ..."
    fi
 }
 
-#build_libretro_s9x()
-#{
-   #if [ -d "libretro-s9x" ]; then
-      #echo "=== Building SNES9x ==="
-      #cd libretro-s9x/libretro
-      #make -j4 || die "Failed to build SNES9x"
-      #cp libretro.so ../libretro-snes9x.so
-      #cd ../..
-   #else
-      #echo "SNES9x not fetched, skipping ..."
-   #fi
-#}
-
-S9X_NEXT_DIR_NAME=snes9x-next
-
 build_libretro_s9x_next()
 {
-   cd $CORES_DIR
-   if [ -d "$S9X_NEXT_DIR_NAME" ]; then
+   cd $BASE_DIR
+   if [ -d "libretro-s9x-next" ]; then
       echo "=== Building SNES9x-Next ==="
-      cd $S9X_NEXT_DIR_NAME
+      cd libretro-s9x-next/
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_snes9x_next.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_snes9x_next.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_snes9x_next.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_snes9x_next.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_snes9x_next.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_snes9x_next.so
    else
       echo "SNES9x-Next not fetched, skipping ..."
    fi
 }
 
-GENPLUS_DIR_NAME=Genesis-Plus-GX
-
 build_libretro_genplus()
 {
-   cd $CORES_DIR
-   if [ -d "$GENPLUS_DIR_NAME" ]; then
+   cd $BASE_DIR
+   if [ -d "libretro-genplus" ]; then
       echo "=== Building Genplus GX ==="
-      cd $GENPLUS_DIR_NAME
+      cd libretro-genplus/
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_genesis_plus_gx.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_genesis_plus_gx.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_genesis_plus_gx.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_genesis_plus_gx.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_genesis_plus_gx.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_genesis_plus_gx.so
    else
       echo "Genplus GX not fetched, skipping ..."
    fi
 }
 
-FBA_DIR_NAME=fba-libretro
-
 build_libretro_fba()
 {
-   cd $CORES_DIR
-   if [ -d "$FBA_DIR_NAME" ]; then
+   cd $BASE_DIR
+   if [ -d "libretro-fba" ]; then
       echo "=== Building Final Burn Alpha ==="
-      cd $FBA_DIR_NAME/svn-current/trunk
+      cd libretro-fba
+      cd svn-current/trunk
       cd projectfiles/libretro-android/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_fba.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_fba.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_fba.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_fba.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_fba.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_fba.so
    else
       echo "Final Burn Alpha not fetched, skipping ..."
    fi
 }
 
-VBA_NEXT_DIR_NAME=vba-next
-
 build_libretro_vba()
 {
-   cd $CORES_DIR
-   if [ -d "$VBA_NEXT_DIR_NAME" ]; then
+   cd $BASE_DIR
+   if [ -d "libretro-vba" ]; then
       echo "=== Building VBA-Next ==="
-      cd $VBA_NEXT_DIR_NAME
+      cd libretro-vba/
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_vba_next.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_vba_next.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_vba_next.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_vba_next.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_vba_next.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_vba_next.so
    else
       echo "VBA-Next not fetched, skipping ..."
    fi
 }
 
-FCEUMM_DIR_NAME=fceu-next
-
 build_libretro_fceu()
 {
-   cd $CORES_DIR
-   if [ -d "$FCEUMM_DIR_NAME" ]; then
+   cd $BASE_DIR
+   if [ -d "libretro-fceu" ]; then
       echo "=== Building FCEU ==="
-      cd $FCEUMM_DIR_NAME
+      cd libretro-fceu
       cd fceumm-code/src/drivers/libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_fceumm.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_fceumm.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_fceumm.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_fceumm.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_fceumm.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_fceumm.so
    else
       echo "FCEU not fetched, skipping ..."
    fi
 }
 
-GAMBATTE_DIR_NAME=gambatte-libretro
-
 build_libretro_gambatte()
 {
-   cd $CORES_DIR
-   if [ -d "$GAMBATTE_DIR_NAME" ]; then
+   cd $BASE_DIR
+   if [ -d "libretro-gambatte" ]; then
       echo "=== Building Gambatte ==="
-      cd $GAMBATTE_DIR_NAME/libgambatte
+      cd libretro-gambatte/libgambatte
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_gambatte.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_gambatte.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_gambatte.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_gambatte.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_gambatte.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_gambatte.so
    else
       echo "Gambatte not fetched, skipping ..."
    fi
 }
 
-NXENGINE_DIR_NAME=nxengine-libretro
-
 build_libretro_nx()
 {
-   cd $CORES_DIR
-   if [ -d "$NXENGINE_DIR_NAME" ]; then
+   cd $BASE_DIR
+   if [ -d "libretro-nx" ]; then
       echo "=== Building NXEngine ==="
-      cd $NXENGINE_DIR_NAME
+      cd libretro-nx
       cd jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_nxengine.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_nxengine.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_nxengine.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_nxengine.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_nxengine.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_nxengine.so
    else
       echo "NXEngine not fetched, skipping ..."
    fi
 }
 
-PRBOOM_DIR_NAME=libretro-prboom
-
 build_libretro_prboom()
 {
-   cd $CORES_DIR
-   if [ -d "$PRBOOM_DIR_NAME" ]; then
+   cd $BASE_DIR
+   if [ -d "libretro-prboom" ]; then
       echo "=== Building PRBoom ==="
-      cd $PRBOOM_DIR_NAME
+      cd libretro-prboom
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_prboom.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_prboom.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_prboom.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_prboom.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_prboom.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_prboom.so
    else
       echo "PRBoom not fetched, skipping ..."
    fi
 }
 
-
-#build_libretro_stella()
-#{
-   #if [ -d "libretro-stella" ]; then
-      #echo "=== Building Stella ==="
-      #cd libretro-stella
-      #make -j4 || die "Failed to build Stella"
-      #cp libretro.so libretro-stella.so
-      #cd ../
-   #else
-      #echo "Stella not fetched, skipping ..."
-   #fi
-#}
-
-#build_libretro_desmume()
-#{
-   #if [ -d "libretro-desmume" ]; then
-      #echo "=== Building Desmume ==="
-      #cd libretro-desmume
-      #make -f Makefile.libretro -j4 || die "Failed to build Desmume"
-      #cp libretro.so libretro-desmume.so
-      #cd ../
-   #else
-      #echo "Desmume not fetched, skipping ..."
-   #fi
-#}
-
-#build_libretro_quicknes()
-#{
-   #if [ -d "libretro-quicknes" ]; then
-      #echo "=== Building QuickNES ==="
-      #cd libretro-quicknes/libretro
-      #make -j4 || die "Failed to build QuickNES"
-      #cp libretro.so ../libretro-quicknes.so
-      #cd ../..
-   #else
-      #echo "QuickNES not fetched, skipping ..."
-   #fi
-#}
-
-NESTOPIA_DIR_NAME=nestopia
-
 build_libretro_nestopia()
 {
-   cd $CORES_DIR
-   if [ -d "$NESTOPIA_DIR_NAME" ]; then
+   cd $BASE_DIR
+   if [ -d "libretro-nestopia" ]; then
       echo "=== Building Nestopia ==="
-      cd $NESTOPIA_DIR_NAME/libretro
+      cd libretro-nestopia/libretro
       cd jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_nestopia.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_nestopia.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_nestopia.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_nestopia.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_nestopia.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_nestopia.so
    else
       echo "Nestopia not fetched, skipping ..."
    fi
 }
 
-PCSX_REARMED_DIR_NAME=pcsx_rearmed
-
 build_libretro_pcsx_rearmed()
 {
-   cd $CORES_DIR
-   if [ -d "$PCSX_REARMED_DIR_NAME" ]; then
+   cd $BASE_DIR
+   pwd
+   if [ -d "libretro-pcsx-rearmed" ]; then
       echo "=== Building PCSX ReARMed ==="
-      cd $PCSX_REARMED_DIR_NAME
+      cd libretro-pcsx-rearmed
       cd jni
       ndk-build clean
       ndk-build -j$JOBS NO_NEON=1
-      cp ../libs/armeabi-v7a/libretro-noneon.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_pcsx_rearmed.so
+      cp ../libs/armeabi-v7a/libretro-noneon.so $RARCH_DIR/android/armeabi-v7a/libretro_pcsx_rearmed.so
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_pcsx_rearmed-neon.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_pcsx_rearmed-neon.so
    else
       echo "PCSX ReARMed not fetched, skipping ..."
    fi
 }
 
-TYRQUAKE_DIR_NAME=tyrquake
-
 build_libretro_tyrquake()
 {
-   cd $CORES_DIR
-   if [ -d "$TYRQUAKE_DIR_NAME" ]; then
+   cd $BASE_DIR
+   if [ -d "libretro-tyrquake" ]; then
       echo "=== Building TyrQuake ==="
-      cd $TYRQUAKE_DIR_NAME
+      cd libretro-tyrquake
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/phoenix/libs/armeabi-v7a/libretro_tyrquake.so
-      cp ../libs/mips/libretro.so $RARCH_DIR/android/phoenix/libs/mips/libretro_tyrquake.so
-      cp ../libs/x86/libretro.so $RARCH_DIR/android/phoenix/libs/x86/libretro_tyrquake.so
+      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIR/android/armeabi-v7a/libretro_tyrquake.so
+      cp ../libs/mips/libretro.so $RARCH_DIR/android/mips/libretro_tyrquake.so
+      cp ../libs/x86/libretro.so $RARCH_DIR/android/x86/libretro_tyrquake.so
    else
       echo "TyrQuake not fetched, skipping ..."
    fi
 }
 
+create_dist_dir()
+{
+   if [ -d $RARCH_DIR ]; then
+      echo "Directory $RARCH_DIR already exists, skipping creation..."
+   else
+      mkdir $RARCH_DIR
+   fi
+
+   if [ -d $RARCH_DIR/android ]; then
+      echo "Directory $RARCH_DIR/android already exists, skipping creation..."
+   else
+      mkdir $RARCH_DIR/android
+   fi
+
+   if [ -d $RARCH_DIR/android/armeabi-v7a ]; then
+      echo "Directory $RARCH_DIR/android/armeabi-v7a already exists, skipping creation..."
+   else
+      mkdir $RARCH_DIR/android/armeabi-v7a
+   fi
+
+   if [ -d $RARCH_DIR/android/mips ]; then
+      echo "Directory $RARCH_DIR/android/mips already exists, skipping creation..."
+   else
+      mkdir $RARCH_DIR/android/mips
+   fi
+
+   if [ -d $RARCH_DIR/android/x86 ]; then
+      echo "Directory $RARCH_DIR/android/x86 already exists, skipping creation..."
+   else
+      mkdir $RARCH_DIR/android/x86
+   fi
+}
+
+create_dist_dir
+
 build_libretro_pcsx_rearmed
 build_libretro_mednafen
-#build_libretro_s9x
 build_libretro_s9x_next
 build_libretro_genplus
 build_libretro_fba
@@ -331,8 +291,5 @@ build_libretro_fceu
 build_libretro_gambatte
 build_libretro_nx
 build_libretro_prboom
-#build_libretro_stella
-#build_libretro_desmume
-#build_libretro_quicknes
 build_libretro_nestopia
 build_libretro_tyrquake
diff --git a/libretro-build.sh b/libretro-build.sh
index f5b7f003..f1c237b7 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+SCRIPT=$(readlink -f $0)
+BASE_DIR=$(dirname $SCRIPT)
+
 die()
 {
    echo $1
@@ -12,37 +15,38 @@ build_libretro_bsnes()
       CC=gcc
    fi
 
+   cd $BASE_DIR
    if [ -d "libretro-bsnes/perf" ]; then
       echo "=== Building bSNES performance ==="
       cd libretro-bsnes/perf/higan
       make compiler="$CC" ui=target-libretro profile=performance -j4 || die "Failed to build bSNES performance core"
       cp -f out/libretro.so ../../libretro-bsnes-performance.so
-      cd ../../..
    else
       echo "bSNES performance not fetched, skipping ..."
    fi
 
+   cd $BASE_DIR
    if [ -d "libretro-bsnes/balanced" ]; then
       echo "=== Building bSNES balanced ==="
       cd libretro-bsnes/balanced/higan
       make compiler="$CC" ui=target-libretro profile=balanced -j4 || die "Failed to build bSNES balanced core"
       cp -f out/libretro.so ../../libretro-bsnes-balanced.so
-      cd ../../..
    else
       echo "bSNES compat not fetched, skipping ..."
    fi
 
+   cd $BASE_DIR
    if [ -d "libretro-bsnes" ]; then
       echo "=== Building bSNES accuracy ==="
       cd libretro-bsnes/higan
       make compiler="$CC" ui=target-libretro profile=accuracy -j4 || die "Failed to build bSNES accuracy core"
       cp -f out/libretro.so ../libretro-bsnes-accuracy.so
-      cd ../..
    fi
 }
 
 build_libretro_mednafen()
 {
+   cd $BASE_DIR
    if [ -d "libretro-mednafen" ]; then
       echo "=== Building Mednafen ==="
       cd libretro-mednafen
@@ -56,7 +60,6 @@ build_libretro_mednafen()
             cd ..
          fi
       done
-      cd ..
    else
       echo "Mednafen not fetched, skipping ..."
    fi
@@ -64,12 +67,12 @@ build_libretro_mednafen()
 
 build_libretro_s9x()
 {
+   cd $BASE_DIR
    if [ -d "libretro-s9x" ]; then
       echo "=== Building SNES9x ==="
       cd libretro-s9x/libretro
       make -j4 || die "Failed to build SNES9x"
       cp libretro.so ../libretro-snes9x.so
-      cd ../..
    else
       echo "SNES9x not fetched, skipping ..."
    fi
@@ -77,12 +80,12 @@ build_libretro_s9x()
 
 build_libretro_s9x_next()
 {
+   cd $BASE_DIR
    if [ -d "libretro-s9x-next" ]; then
       echo "=== Building SNES9x-Next ==="
       cd libretro-s9x-next/
       make -f Makefile.libretro -j4 || die "Failed to build SNES9x-Next"
       cp snes9x_next_libretro.so libretro-snes9x-next.so
-      cd ..
    else
       echo "SNES9x-Next not fetched, skipping ..."
    fi
@@ -90,12 +93,12 @@ build_libretro_s9x_next()
 
 build_libretro_genplus()
 {
+   cd $BASE_DIR
    if [ -d "libretro-genplus" ]; then
       echo "=== Building Genplus GX ==="
       cd libretro-genplus/
       make -f Makefile.libretro -j4 || die "Failed to build Genplus GX"
       cp genesis_plus_gx_libretro.so libretro-genplus.so
-      cd ..
    else
       echo "Genplus GX not fetched, skipping ..."
    fi
@@ -103,12 +106,12 @@ build_libretro_genplus()
 
 build_libretro_fba()
 {
+   cd $BASE_DIR
    if [ -d "libretro-fba" ]; then
       echo "=== Building Final Burn Alpha ==="
       cd libretro-fba/
       ./compile_libretro.sh make || die "Failed to build Final Burn Alpha"
       cp svn-current/trunk/fb_alpha_libretro.so libretro-fba.so
-      cd ..
    else
       echo "Final Burn Alpha not fetched, skipping ..."
    fi
@@ -116,12 +119,12 @@ build_libretro_fba()
 
 build_libretro_vba()
 {
+   cd $BASE_DIR
    if [ -d "libretro-vba" ]; then
       echo "=== Building VBA-Next ==="
       cd libretro-vba/
       make -f Makefile.libretro -j4 || die "Failed to build VBA-Next"
       cp vba_next_libretro.so libretro-vba.so
-      cd ..
    else
       echo "VBA-Next not fetched, skipping ..."
    fi
@@ -129,13 +132,13 @@ build_libretro_vba()
 
 build_libretro_bnes()
 {
+   cd $BASE_DIR
    if [ -d "libretro-bnes" ]; then
       echo "=== Building bNES ==="
       cd libretro-bnes
       mkdir -p obj
       make -j4 || die "Failed to build bNES"
       cp libretro.so libretro-bnes.so
-      cd ..
    else
       echo "bNES not fetched, skipping ..."
    fi
@@ -143,12 +146,12 @@ build_libretro_bnes()
 
 build_libretro_fceu()
 {
+   cd $BASE_DIR
    if [ -d "libretro-fceu" ]; then
       echo "=== Building FCEU ==="
       cd libretro-fceu
       make -C fceumm-code -f Makefile.libretro -j4 || die "Failed to build FCEU"
       cp fceumm-code/fceumm_libretro.so libretro-fceu.so
-      cd ..
    else
       echo "FCEU not fetched, skipping ..."
    fi
@@ -156,12 +159,12 @@ build_libretro_fceu()
 
 build_libretro_gambatte()
 {
+   cd $BASE_DIR
    if [ -d "libretro-gambatte" ]; then
       echo "=== Building Gambatte ==="
       cd libretro-gambatte/libgambatte
       make -f Makefile.libretro -j4 || die "Failed to build Gambatte"
       cp gambatte_libretro.so ../libretro-gambatte.so
-      cd ../..
    else
       echo "Gambatte not fetched, skipping ..."
    fi
@@ -169,12 +172,12 @@ build_libretro_gambatte()
 
 build_libretro_meteor()
 {
+   cd $BASE_DIR
    if [ -d "libretro-meteor" ]; then
       echo "=== Building Meteor ==="
       cd libretro-meteor/libretro
       make -j4 || die "Failed to build Meteor"
       cp libretro.so ../libretro-meteor.so
-      cd ../..
    else
       echo "Meteor not fetched, skipping ..."
    fi
@@ -182,12 +185,12 @@ build_libretro_meteor()
 
 build_libretro_nx()
 {
+   cd $BASE_DIR
    if [ -d "libretro-nx" ]; then
       echo "=== Building NXEngine ==="
       cd libretro-nx
       make -j4 || die "Failed to build NXEngine"
       cp nxengine_libretro.so libretro-nx.so
-      cd ..
    else
       echo "NXEngine not fetched, skipping ..."
    fi
@@ -195,12 +198,12 @@ build_libretro_nx()
 
 build_libretro_prboom()
 {
+   cd $BASE_DIR
    if [ -d "libretro-prboom" ]; then
       echo "=== Building PRBoom ==="
       cd libretro-prboom
       make -j4 || die "Failed to build PRBoom"
       cp prboom_libretro.so libretro-prboom.so
-      cd ../
    else
       echo "PRBoom not fetched, skipping ..."
    fi
@@ -208,12 +211,12 @@ build_libretro_prboom()
 
 build_libretro_stella()
 {
+   cd $BASE_DIR
    if [ -d "libretro-stella" ]; then
       echo "=== Building Stella ==="
       cd libretro-stella
       make -j4 || die "Failed to build Stella"
       cp libretro.so libretro-stella.so
-      cd ../
    else
       echo "Stella not fetched, skipping ..."
    fi
@@ -221,12 +224,12 @@ build_libretro_stella()
 
 build_libretro_desmume()
 {
+   cd $BASE_DIR
    if [ -d "libretro-desmume" ]; then
       echo "=== Building Desmume ==="
       cd libretro-desmume
       make -f Makefile.libretro -j4 || die "Failed to build Desmume"
       cp libretro.so libretro-desmume.so
-      cd ../
    else
       echo "Desmume not fetched, skipping ..."
    fi
@@ -234,12 +237,12 @@ build_libretro_desmume()
 
 build_libretro_quicknes()
 {
+   cd $BASE_DIR
    if [ -d "libretro-quicknes" ]; then
       echo "=== Building QuickNES ==="
       cd libretro-quicknes/libretro
       make -j4 || die "Failed to build QuickNES"
       cp libretro.so ../libretro-quicknes.so
-      cd ../..
    else
       echo "QuickNES not fetched, skipping ..."
    fi
@@ -247,12 +250,12 @@ build_libretro_quicknes()
 
 build_libretro_nestopia()
 {
+   cd $BASE_DIR
    if [ -d "libretro-nestopia" ]; then
       echo "=== Building Nestopia ==="
       cd libretro-nestopia/libretro
       make -j4 || die "Failed to build Nestopia"
       cp nestopia_libretro.so ../libretro-nestopia.so
-      cd ../..
    else
       echo "Nestopia not fetched, skipping ..."
    fi
@@ -260,12 +263,12 @@ build_libretro_nestopia()
 
 build_libretro_tyrquake()
 {
+   cd $BASE_DIR
    if [ -d "libretro-tyrquake" ]; then
       echo "=== Building Tyr Quake ==="
       cd libretro-tyrquake
       make -f Makefile.libretro -j4 || die "Failed to build Tyr Quake"
       cp tyrquake_libretro.so libretro-tyrquake.so
-      cd ..
    else
       echo "Tyr Quake not fetched, skipping ..."
    fi
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index f1ce2b5b..e87d1168 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -95,5 +95,6 @@ fetch_project "$REPO_BASE/libretro/desmume-libretro.git" "libretro-desmume" "lib
 fetch_project "$REPO_BASE/libretro/QuickNES_Core.git" "libretro-quicknes" "libretro/QuickNES"
 fetch_project "$REPO_BASE/libretro/nestopia.git" "libretro-nestopia" "libretro/Nestopia"
 fetch_project "$REPO_BASE/libretro/tyrquake.git" "libretro-tyrquake" "libretro/tyrquake"
+fetch_project "$REPO_BASE/libretro/pcsx_rearmed.git" "libretro-pcsx-rearmed" "libretro/pcsx_rearmed"
 fetch_project_mednafen "$REPO_BASE/libretro/mednafen-libretro.git" "libretro-mednafen" "libretro/Mednafen"