diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh
new file mode 100755
index 0000000000..62e3232aec
--- /dev/null
+++ b/dist-scripts/dist-cores.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+RARCH_VERSION=1.2.2
+PLATFORM=$1
+
+if [ $PLATFORM = "dex-ps3" ] ; then
+platform=ps3
+
+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
+if [ $PLATFORM = "cex-ps3" ]; then
+platform=ps3
+
+EXE_PATH=/usr/local/cell/host-win32/bin
+fi
+
+make -C ../ -f Makefile.${platform}.salamander clean || exit 1
+make -C ../ -f Makefile.${platform} clean || exit 1
+
+make -C ../ -f Makefile.${platform}.salamander || exit 1
+
+for f in *_${platform}.a ; do
+   name=`echo "$f" | sed "s/\(_libretro_${platform}\|\).a$//"`
+   whole_archive=
+   if [ $name = "nxengine" ] ; then
+      echo "Applying whole archive linking..."
+      whole_archive="WHOLE_ARCHIVE_LINK=1"
+   fi
+   if [ $name = "tyrquake" ] ; then
+      echo "Applying big stack..."
+      big_stack="BIG_STACK=1"
+   fi
+   echo "-- Building core: $name --"
+   cp -f "$f" ../libretro_${platform}.a
+   make -C ../ -f Makefile.${platform} $whole_archive $big_stack -j3 || exit 1
+
+   if [ $PLATFORM = "dex-ps3" ] ; then
+      $MAKE_FSELF_NPDRM ../retroarch_${platform}.elf ../CORE.SELF
+   fi
+   if [ $PLATFORM = "cex-ps3" ] ; then
+      make -C ../ -f Makefile.${platform} $whole_archive -j3 || exit 1
+      make_self_wc ../retroarch_${platform}.elf ../CORE.SELF
+   fi
+
+   if [ $platform = "ps3" ] ; then
+      mv -f ../CORE.SELF ../pkg/${platform}/USRDIR/cores/"${name}_libretro_${platform}.SELF"
+      rm -f ../retroarch_${platform}.elf ../retroarch_${platform}.self ../CORE.SELF
+   fi
+done
+
+if [ $PLATFORM = "ps3" ] ; then
+   make -C ../ -f Makefile.griffin platform=${platform} shaders-deploy
+fi
+
+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
+   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
diff --git a/dist-scripts/ps3-cores-cex-355.sh b/dist-scripts/ps3-cores-cex-355.sh
index dcbccf3992..e69de29bb2 100755
--- a/dist-scripts/ps3-cores-cex-355.sh
+++ b/dist-scripts/ps3-cores-cex-355.sh
@@ -1,31 +0,0 @@
-#!/bin/sh
-RARCH_VERSION=1.2.2
-platform=ps3
-
-make -C ../ -f Makefile.${platform}.salamander clean || exit 1
-make -C ../ -f Makefile.${platform} clean || exit 1
-
-make -C ../ -f Makefile.${platform}.salamander || exit 1
-
-EXE_PATH=/usr/local/cell/host-win32/bin
-
-for f in *_${platform}.a ; do
-   name=`echo "$f" | sed "s/\(_libretro_${platform}\|\).a$//"`
-   whole_archive=
-   if [ $name = "nxengine" ] ; then
-      echo "Applying whole archive linking..."
-      whole_archive="WHOLE_ARCHIVE_LINK=1"
-   fi
-   echo $name yes
-   cp -f "$f" ../libretro_${platform}.a
-   make -C ../ -f Makefile.${platform} $whole_archive -j3 || exit 1
-   make_self_wc ../retroarch_${platform}.elf ../CORE.SELF
-   mv -f ../CORE.SELF ../pkg/${platform}/USRDIR/cores/"${name}_libretro_${platform}.SELF"
-   rm -f ../retroarch_${platform}.elf ../retroarch_${platform}.self ../CORE.SELF
-done
-
-make -C ../ -f Makefile.shaders deploy-ps3
-
-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
diff --git a/dist-scripts/ps3-cores-dex.sh b/dist-scripts/ps3-cores-dex.sh
deleted file mode 100755
index e3cad2b1bc..0000000000
--- a/dist-scripts/ps3-cores-dex.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-platform=ps3
-
-make -C ../ -f Makefile.${platform}.salamander clean || exit 1
-make -C ../ -f Makefile.${platform} clean || exit 1
-
-make -C ../ -f Makefile.${platform}.salamander || exit 1
-
-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
-
-for f in *_${platform}.a ; do
-   name=`echo "$f" | sed "s/\(_libretro_${platform}\|\).a$//"`
-   whole_archive=
-   if [ $name = "nxengine" ] ; then
-      echo "Applying whole archive linking..."
-      whole_archive="WHOLE_ARCHIVE_LINK=1"
-   fi
-   if [ $name = "tyrquake" ] ; then
-      echo "Applying big stack..."
-      big_stack="BIG_STACK=1"
-   fi
-   echo "-- Building core: $name --"
-   cp -f "$f" ../libretro_${platform}.a
-   make -C ../ -f Makefile.${platform} $whole_archive $big_stack -j3 || exit 1
-   $MAKE_FSELF_NPDRM ../retroarch_${platform}.elf ../CORE.SELF
-   mv -f ../CORE.SELF ../pkg/${platform}/USRDIR/cores/"${name}_libretro_${platform}.SELF"
-   rm -f ../retroarch_${platform}.elf ../retroarch_${platform}.self ../CORE.SELF
-done
-
-cp -r ../media/rmenu/*.png ../pkg/${platform}/USRDIR/cores/borders/Menu/
-
-make -C ../ -f Makefile.griffin platform=${platform} shaders-deploy
-
-$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}