diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh
index 8358c6505a..ce72246b80 100755
--- a/dist-scripts/dist-cores.sh
+++ b/dist-scripts/dist-cores.sh
@@ -2,10 +2,13 @@
 
 RARCH_VERSION=1.2.2
 PLATFORM=$1
+SALAMANDER=no
+MAKEFILE_GRIFFIN=no
 
 # PSP
 if [ $PLATFORM = "psp1" ] ; then
 platform=psp1
+SALAMANDER=yes
 
 mkdir -p ../pkg/${platform}/cores/
 
@@ -13,39 +16,57 @@ make -C ../${platform}/kernelFunctionsPrx/ clean || exit 1
 make -C ../${platform}/kernelFunctionsPrx/ || exit 1
 cp -f ../kernel_functions.prx ../pkg/${platform}/kernel_functions.prx
 mv -f ../EBOOT.PBP ../pkg/${platform}/EBOOT.PBP
-fi
+
+# Vita
+elif [ $PLATFORM = "vita" ] ; then
+platform=vita
+MAKEFILE_GRIFFIN=yes
+
 # DEX PS3
-if [ $PLATFORM = "dex-ps3" ] ; then
+elif [ $PLATFORM = "dex-ps3" ] ; then
 platform=ps3
+SALAMANDER=yes
 
 EXE_PATH=/usr/local/cell/host-win32/bin
 MAKE_FSELF_NPDRM=$EXE_PATH/make_fself_npdrm.exe
 MAKE_PACKAGE_NPDRM=$EXE_PATH/make_package_npdrm.exe
-fi
+
 # CEX PS3
-if [ $PLATFORM = "cex-ps3" ]; then
+elif [ $PLATFORM = "cex-ps3" ]; then
 platform=ps3
+SALAMANDER=yes
 
 EXE_PATH=/usr/local/cell/host-win32/bin
-fi
+
 # ODE PS3
-if [ $PLATFORM = "ode-ps3" ]; then
+elif [ $PLATFORM = "ode-ps3" ]; then
 #For this script to work correctly, you must place the "data" folder containing your ps3 keys for scetool to use in the dist-scripts folder.
 platform=ps3
+SALAMANDER=yes
 
 GENPS3ISO_PATH=/cygdrive/c/Cobra_ODE_GenPS3iso_v2.3/genps3iso.exe 
 SCETOOL_PATH=/cygdrive/c/Users/aaa801/ps3tools/ps3tools/tools/scetool/scetool.exe
 SCETOOL_FLAGS="--sce-type SELF --compress-data FALSE --self-type APP --key-revision 0004 --self-fw-version 0003004100000000 --self-app-version 0001000000000000 --self-auth-id 1010000001000003 --self-vendor-id 01000002 --self-cap-flags 00000000000000000000000000000000000000000000003b0000000100040000"
 fi
 
+# Cleanup Salamander core if it exists 
+if [ $SALAMANDER = "yes" ]; then
 make -C ../ -f Makefile.${platform}.salamander clean || exit 1
+fi
+
+# Cleanup existing core if it exists 
 if [ $PLATFORM = "ode-ps3" ]; then
    make -C ../ -f Makefile.${platform}.cobra clean || exit 1
+elif [ $MAKEFILE_GRIFFIN = "yes" ]; then
+   make -C ../ -f Makefile.griffin platform=${platform} clean || exit 1
 else
    make -C ../ -f Makefile.${platform} clean || exit 1
 fi
 
-make -C ../ -f Makefile.${platform}.salamander || exit 1
+# Compile Salamander core
+if [ $SALAMANDER = "yes" ]; then
+   make -C ../ -f Makefile.${platform}.salamander || exit 1
+fi
 
 for f in *_${platform}.a ; do
    name=`echo "$f" | sed "s/\(_libretro_${platform}\|\).a$//"`
@@ -53,67 +74,87 @@ for f in *_${platform}.a ; do
    if [ $name = "nxengine" ] ; then
       echo "Applying whole archive linking..."
       whole_archive="WHOLE_ARCHIVE_LINK=1"
-   fi
-   if [ $name = "tyrquake" ] ; then
+   elif [ $name = "tyrquake" ] ; then
       echo "Applying big stack..."
       big_stack="BIG_STACK=1"
    fi
    echo "-- Building core: $name --"
    cp -f "$f" ../libretro_${platform}.a
 
+   # Do cleanup if this is a big stack core
    if [ $big_stack="BIG_STACK=1" ] ; then
-      make -C ../ -f Makefile.${platform} clean || exit 1
+      if [ $MAKEFILE_GRIFFIN = "yes" ]; then
+         make -C ../ -f Makefile.griffin platform=${platform} clean || exit 1
+      else
+         make -C ../ -f Makefile.${platform} clean || exit 1
+      fi
    fi
 
+   # Compile core
    if [ $PLATFORM = "ode-ps3" ] ; then
       make -C ../ -f Makefile.${platform}.cobra $whole_archive -j3 || exit 1
+   elif [ $MAKEFILE_GRIFFIN = "yes" ]; then
+      make -C ../ -f Makefile.griffin platform=${platform} $whole_archive $big_stack -j3 || exit 1
    else
       make -C ../ -f Makefile.${platform} $whole_archive $big_stack -j3 || exit 1
    fi
 
-   if [ $PLATFORM = "psp1" ] ; then
-      mv -f ../EBOOT.PBP ../pkg/${platform}/cores/${name}_libretro.PBP
-      rm -f ../retroarchpsp.elf
-   fi
+   # Do manual executable step 
    if [ $PLATFORM = "dex-ps3" ] ; then
       $MAKE_FSELF_NPDRM ../retroarch_${platform}.elf ../CORE.SELF
-   fi
-   if [ $PLATFORM = "cex-ps3" ] ; then
+   elif [ $PLATFORM = "cex-ps3" ] ; then
       make_self_wc ../retroarch_${platform}.elf ../CORE.SELF
-   fi
-   if [ $PLATFORM = "ode-ps3" ] ; then
+   elif [ $PLATFORM = "ode-ps3" ] ; then
       $SCETOOL_PATH $SCETOOL_FLAGS --encrypt ../retroarch_${platform}.elf ../CORE.SELF
    fi
 
+   # Move executable files
    if [ $platform = "ps3" ] ; then
       if [ $PLATFORM = "ode-ps3" ] ; then
          mv -f ../CORE.SELF ../pkg/${platform}/USRDIR/cores/"${name}_libretro_${platform}.SELF"
       else
          mv -f ../CORE.SELF ../${platform}/iso/PS3_GAME/USRDIR/cores/"${name}_libretro_${platform}.SELF"
       fi
-      rm -f ../retroarch_${platform}.elf ../retroarch_${platform}.self ../CORE.SELF
+   elif [ $PLATFORM = "psp1" ] ; then
+      mv -f ../EBOOT.PBP ../pkg/${platform}/cores/${name}_libretro.PBP
+   elif [ $PLATFORM = "vita" ] ; then
+      mv -f ../retroarch_${platform}.velf ../pkg/${platform}/${name}_libretro_${platform}.velf
    fi
 
+   # Remove executable files
+   if [ $platform = "ps3" ] ; then
+      rm -f ../retroarch_${platform}.elf ../retroarch_${platform}.self ../CORE.SELF
+   elif [ $PLATFORM = "psp1" ] ; then
+      rm -f ../retroarchpsp.elf
+   elif [ $PLATFORM = "vita" ] ; then
+      rm -f ../retroarch_${platform}.velf ../retroarch_${platform}.elf
+   fi
+
+   # Do cleanup if this is a big stack core
    if [ $big_stack="BIG_STACK=1" ] ; then
-      make -C ../ -f Makefile.${platform} clean || exit 1
+      if [ $MAKEFILE_GRIFFIN = "yes" ]; then
+         make -C ../ -f Makefile.griffin platform=${platform} clean || exit 1
+      else
+         make -C ../ -f Makefile.${platform} clean || exit 1
+      fi
    fi
 done
 
+# Additional build step
 if [ $PLATFORM = "ps3" ] ; then
    make -C ../ -f Makefile.griffin platform=${platform} shaders-deploy
 fi
 
+# Packaging
 if [ $PLATFORM = "dex-ps3" ] ; then
    $MAKE_FSELF_NPDRM ../retroarch-salamander_${platform}.elf ../pkg/${platform}/USRDIR/EBOOT.BIN
    rm -rf ../retroarch-salamander_${platform}.elf
    $MAKE_PACKAGE_NPDRM ../pkg/${platform}/package.conf ../pkg/${platform}
-fi
-if [ $PLATFORM = "cex-ps3" ] ; then
+elif [ $PLATFORM = "cex-ps3" ] ; then
    make_self_wc ../retroarch-salamander_${platform}.elf ../pkg/${platform}/USRDIR/EBOOT.BIN
    rm -rf ../retroarch-salamander_${platform}.elf
    python2 ../ps3/ps3py/pkg.py --contentid UP0001-SSNE10000_00-0000000000000001 ../pkg/${platform} retroarch-${platform}-cfw-$RARCH_VERSION.pkg
-fi
-if [ $PLATFORM = "ode-ps3" ] ; then
+elif [ $PLATFORM = "ode-ps3" ] ; then
    $SCETOOL_PATH $SCETOOL_FLAGS --encrypt ../retroarch-salamander_${platform}.elf ../${platform}/iso/PS3_GAME/USRDIR/EBOOT.BIN
    rm -rf ../retroarch-salamander_${platform}.elf
 
diff --git a/dist-scripts/vita-cores.sh b/dist-scripts/vita-cores.sh
deleted file mode 100755
index bf686e74a5..0000000000
--- a/dist-scripts/vita-cores.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-platform=vita
-
-#make -C ../ -f Makefile.${platform}.salamander clean || exit 1
-make -C ../ -f Makefile.griffin platform=${platform} clean || exit 1
-
-#make -C ../ -f Makefile.${platform}.salamander || exit 1
-#make -C ../ -f Makefile.${platform}.salamander pkg || exit 1
-
-for f in *_vita.a ; do
-   name=`echo "$f" | sed "s/\(_libretro_${platform}\|\).a$//"`
-   whole_archive=
-   big_stack=
-   if [ $name = "nxengine" ] ; then
-      echo "NXEngine found, applying whole archive linking..."
-      whole_archive="WHOLE_ARCHIVE_LINK=1"
-   fi
-   if [ $name = "tyrquake" ] ; then
-      echo "Tyrquake found, applying big stack..."
-      big_stack="BIG_STACK=1"
-   fi
-   cp -f "$f" ../libretro_${platform}.a
-   make -C ../ -f Makefile.griffin platform=${platform} $whole_archive $big_stack -j3 || exit 1
-   mv -f ../retroarch_${platform}.velf ../pkg/${platform}/${name}_libretro_${platform}.velf
-   rm -f ../retroarch_${platform}.velf ../retroarch_${platform}.elf
-done