diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index 96cf8baa..ae1a708f 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -66,7 +66,7 @@ build_libretro_mednafen_psx()
 {
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-mednafen" ]; then
+   if [ -d "libretro-mednafen-psx" ]; then
       cd libretro-mednafen-psx
       cd jni
       echo "=== Building Mednafen PSX ==="
@@ -82,6 +82,26 @@ build_libretro_mednafen_psx()
    fi
 }
 
+build_libretro_mednafen_pce_fast()
+{
+   cd $BASE_DIR
+   pwd
+   if [ -d "libretro-mednafen-pce-fast" ]; then
+      cd libretro-mednafen-pce-fast
+      cd jni
+      echo "=== Building Mednafen PCE Fast ==="
+      if [ -z "${NOCLEAN}" ]; then
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Mednafen PCE Fast"
+      fi
+      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Mednafen PCE Fast"
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_pce_fast_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_pce_fast_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_pce_fast_libretro${FORMAT}.${FORMAT_EXT}
+   else
+      echo "Mednafen PCE Fast not fetched, skipping ..."
+   fi
+}
+
 build_libretro_s9x()
 {
    cd $BASE_DIR
@@ -640,9 +660,10 @@ else
    #build_libretro_bsnes_cplusplus98
    build_libretro_bsnes
    build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
+   build_libretro_mednafen_psx
    #build_libretro_mednafen_gba
    #build_libretro_mednafen_snes
-   #build_libretro_mednafen_psx
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index fee4f9e8..5326b030 100644
--- a/libretro-build-common-xdk.sh
+++ b/libretro-build-common-xdk.sh
@@ -8,7 +8,7 @@ die()
 
 build_libretro_mednafen()
 {
-   for core in pce_fast pcfx wswan ngp gba vb; do
+   for core in pcfx wswan ngp gba vb; do
    	cd $BASE_DIR
    	if [ -d "libretro-mednafen" ]; then
       		echo "=== Building Mednafen ${core} ==="
@@ -22,6 +22,20 @@ build_libretro_mednafen()
    done
 }
 
+build_libretro_mednafen_pce_fast()
+{
+   cd $BASE_DIR
+   if [ -d "libretro-mednafen-pce-fast" ]; then
+      echo "=== Building Mednafen PCE Fast ==="
+      cd libretro-mednafen-pce-fast
+      cd msvc
+      cmd.exe /k $MSVC_NAME.bat
+      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_pce_fast_libretro$FORMAT.$FORMAT_EXT
+   else
+      echo "Mednafen PCE Fast not fetched, skipping ..."
+   fi
+}
+
 build_libretro_s9x()
 {
    cd $BASE_DIR
diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index a2f30f4d..da6b50de 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -180,7 +180,7 @@ build_libretro_mednafen() {
       echo '=== Building Mednafen ==='
       cd libretro-mednafen
 
-      for core in pce_fast pcfx psx lynx wswan ngp gba vb; do
+      for core in pcfx lynx wswan ngp gba vb; do
          if [ -z "${NOCLEAN}" ]; then
             "${MAKE}" core="${core}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/${core}"
          fi
@@ -192,6 +192,20 @@ build_libretro_mednafen() {
    fi
 }
 
+build_libretro_mednafen_pce_fast() {
+   cd "${BASE_DIR}"
+   if [ -d 'libretro-mednafen-pce-fast' ]; then
+      echo '=== Building Mednafen PCE Fast ==='
+      cd libretro-mednafen-pce-fast
+
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/pce_fast"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build mednafen/pce_fast"
+      cp "mednafen_pce_fast_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
+   else
+      echo 'Mednafen PCE Fast not fetched, skipping ...'
+   fi
+}
+
 build_libretro_mednafen_psx() {
    cd "${BASE_DIR}"
    if [ -d 'libretro-mednafen-psx' ]; then
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index c833daa6..d84a2b61 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -30,6 +30,7 @@ else
    build_libretro_bsnes_cplusplus98
    build_libretro_bsnes
    build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
    build_libretro_mednafen_psx
    #build_libretro_mednafen_snes
    build_libretro_s9x
diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh
index 25f3271d..6ec1007c 100755
--- a/libretro-build-ngc.sh
+++ b/libretro-build-ngc.sh
@@ -18,6 +18,7 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh
index dcf5058c..3b14d5c5 100755
--- a/libretro-build-ps3.sh
+++ b/libretro-build-ps3.sh
@@ -17,6 +17,7 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
    build_libretro_mednafen_psx
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-psp1.sh b/libretro-build-psp1.sh
index 59eb8e6c..71320d13 100755
--- a/libretro-build-psp1.sh
+++ b/libretro-build-psp1.sh
@@ -16,6 +16,7 @@ MAKE=make
 if [ $1 ]; then
    $1
 else
+   build_libretro_mednafen_pce_fast
    build_libretro_mednafen
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh
index 34422409..3981b6ee 100755
--- a/libretro-build-qnx.sh
+++ b/libretro-build-qnx.sh
@@ -19,6 +19,7 @@ else
    build_libretro_bsnes_cplusplus98
    #build_libretro_bsnes
    build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
    build_libretro_mednafen_psx
    build_libretro_s9x
    build_libretro_s9x_next
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
index e898cac2..809d125c 100644
--- a/libretro-build-win.sh
+++ b/libretro-build-win.sh
@@ -21,6 +21,7 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-xdk1.sh b/libretro-build-xdk1.sh
index 07fe5b8c..4cdd9bba 100644
--- a/libretro-build-xdk1.sh
+++ b/libretro-build-xdk1.sh
@@ -80,6 +80,7 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index ba5cacf5..771a1eea 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -36,6 +36,7 @@ if [ $1 ]; then
    $1
 else
    build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build.sh b/libretro-build.sh
index a266225a..29cfa400 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -97,6 +97,7 @@ else
    build_libretro_bsnes_cplusplus98
    build_libretro_bsnes
    build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
    build_libretro_mednafen_psx
    build_libretro_mednafen_snes
    build_libretro_s9x
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index d79dc300..16f470ac 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -95,6 +95,7 @@ fetch_project "$REPO_BASE/libretro/nestopia.git" "libretro-nestopia" "libretro/N
 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 "$REPO_BASE/libretro/mednafen-libretro.git" "libretro-mednafen" "libretro/Mednafen"
+fetch_project "$REPO_BASE/libretro/mednafen-pce-fast-libretro.git" "libretro-mednafen-pce-fast" "libretro/Mednafen PCE Fast"
 fetch_project "$REPO_BASE/libretro/mednafen-psx-libretro.git" "libretro-mednafen-psx" "libretro/Mednafen PSX"
 fetch_project "$REPO_BASE/libretro/scummvm.git" "libretro-scummvm" "libretro/scummvm"
 fetch_project "$REPO_BASE/libretro/yabause.git" "libretro-yabause" "libretro/yabause"