diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 955dcd60..99fd790e 100644
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -461,6 +461,42 @@ build_libretro_bnes()
    fi
 }
 
+build_libretro_mupen64()
+{
+   cd "$BASE_DIR"
+   if [ -d "libretro-mupen64plus" ]; then
+      echo "=== Building Mupen 64 Plus ==="
+      cd libretro-mupen64plus
+      mkdir -p obj
+      ${MAKE} -j$JOBS clean || die "Failed to clean Mupen 64"
+      ${MAKE} $COMPILER -j$JOBS || die "Failed to build Mupen 64"
+      cp mupen64plus_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
+   else
+      echo "Mupen64 Plus not fetched, skipping ..."
+   fi
+}
+
+build_libretro_picodrive()
+{
+   cd "$BASE_DIR"
+   pwd
+   if [ -d "libretro-picodrive" ]; then
+      echo "=== Building Picodrive ==="
+      cd libretro-picodrive
+      if [ "$ARMV7" = true ]; then
+         echo "=== Building PCSX ReARMed (ARMV7 NEON) ==="
+         ${MAKE} -f Makefile.libretro platform=arm -j$JOBS clean || die "Failed to clean Picodrive"
+         ${MAKE} -f Makefile.libretro platform=arm -j$JOBS || die "Failed to build Picodrive"
+      else
+         ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS clean || die "Failed to clean Picodrive"
+         ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS || die "Failed to build PCSX Picodrive"
+      fi
+      cp picodrive_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
+   else
+      echo "Picodrive not fetched, skipping ..."
+   fi
+}
+
 create_dist_dir()
 {
    if [ -d $RARCH_DIST_DIR ]; then
diff --git a/libretro-build.sh b/libretro-build.sh
index 09f62700..aee4e186 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -188,6 +188,7 @@ else
    build_libretro_scummvm
    build_libretro_modelviewer
    build_libretro_scenewalker
+   build_libretro_picodrive
 if [ $FORMAT_COMPILER_TARGET != "win" ]; then
    build_libretro_desmume
    build_libretro_pcsx_rearmed