diff --git a/libretro-build.sh b/libretro-build.sh
index cd153ac3..20ea08cc 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -41,6 +41,25 @@ build_libretro_bsnes()
    fi
 }
 
+build_libretro_mednafen()
+{
+   if [ -d "libretro-mednafen" ]; then
+      echo "=== Building Mednafen ==="
+      cd libretro-mednafen
+
+      for core in psx pce-fast wswan
+      do
+         cd $core
+         make core=${core} -j4 || die "Failed to build mednafen/${core}"
+         cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro.so ../libretro-mednafen-${core}.so
+         cd ..
+      done
+      cd ../
+   else
+      echo "Mednafen not fetched, skipping ..."
+   fi
+}
+
 build_libretro_s9x()
 {
    if [ -d "libretro-s9x" ]; then
@@ -163,10 +182,10 @@ build_libretro_nx()
 {
    if [ -d "libretro-nx" ]; then
       echo "=== Building NXEngine ==="
-      cd libretro-nx
+      cd libretro-nx/nxengine-1.0.0.4
       make -j4 || die "Failed to build NXEngine"
-      cp libretro.so libretro-nx.so
-      cd ../
+      cp libretro.so ../libretro-nx.so
+      cd ../..
    else
       echo "NXEngine not fetched, skipping ..."
    fi
@@ -211,20 +230,8 @@ build_libretro_desmume()
    fi
 }
 
-build_libretro_mednafen()
-{
-   if [ -d "libretro-mednafen-${1}" ]; then
-      echo "=== Building Mednafen/${2} ==="
-      cd libretro-mednafen-${1}
-      make -j4 || die "Failed to build Mednafen/${2}"
-      cp libretro.so libretro-mednafen-${1}.so
-      cd ../
-   else
-      echo "Mednafen/${2} not fetched, skipping ..."
-   fi
-}
-
 build_libretro_bsnes
+build_libretro_mednafen
 build_libretro_s9x
 build_libretro_s9x_next
 build_libretro_genplus
@@ -238,8 +245,4 @@ build_libretro_nx
 build_libretro_prboom
 build_libretro_stella
 build_libretro_desmume
-build_libretro_mednafen psx PSX
-build_libretro_mednafen pce PCE
-build_libretro_mednafen wswan WSwan
-build_libretro_mednafen ngp NGP
 
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 5629fc4a..c0e4cc70 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -36,6 +36,33 @@ fetch_project_bsnes()
    fi
 }
 
+fetch_project_mednafen()
+{
+   echo "=== Fetching $3 ==="
+   if [ -d "$2" ]; then
+      cd "$2"
+      git pull
+      cd ..
+   else
+      git clone $1 "$2"
+   fi
+
+   if [ -d "$2" ]; then
+      cd "$2"
+      for core in psx pce_fast wswan
+      do
+         if [ -d "$core" ]; then
+            cd $core
+            git pull ..
+            cd ..
+         else
+            git clone . $core
+         fi
+      done
+      cd ..
+   fi
+}
+
 fetch_project()
 {
    echo "=== Fetching $3 ==="
@@ -63,9 +90,5 @@ fetch_project "$REPO_BASE/libretro/gambatte-libretro.git" "libretro-gambatte" "l
 fetch_project "$REPO_BASE/libretro/meteor-libretro.git" "libretro-meteor" "libretro/Meteor"
 fetch_project "$REPO_BASE/libretro/nxengine-libretro.git" "libretro-nx" "libretro/NX"
 fetch_project "$REPO_BASE/libretro/libretro-prboom.git" "libretro-prboom" "libretro/PRBoom"
-fetch_project "$REPO_BASE/libretro/mednafen-psx-libretro.git" "libretro-mednafen-psx" "libretro/mednafen-PSX"
-fetch_project "$REPO_BASE/libretro/mednafen-pce-libretro.git" "libretro-mednafen-pce" "libretro/mednafen-PCE"
-fetch_project "$REPO_BASE/libretro/mednafen-wswan-libretro.git" "libretro-mednafen-wswan" "libretro/mednafen-WSwan"
-fetch_project "$REPO_BASE/libretro/mednafen-ngp-libretro.git" "libretro-mednafen-ngp" "libretro/mednafen-NGP"
-fetch_project "$REPO_BASE/libretro/desmume-libretro.git" "libretro-desmume" "libretro/Desmume"
+fetch_project_mednafen "$REPO_BASE/libretro/mednafen-psx-libretro.git" "libretro-mednafen" "libretro/Mednafen"
 
diff --git a/libretro-install.sh b/libretro-install.sh
index 41cab956..3b8768b8 100755
--- a/libretro-install.sh
+++ b/libretro-install.sh
@@ -27,10 +27,9 @@ LIBS="$LIBS libretro-nx/libretro-nx.so"
 LIBS="$LIBS libretro-prboom/libretro-prboom.so"
 LIBS="$LIBS libretro-stella/libretro-stella.so"
 LIBS="$LIBS libretro-desmume/libretro-desmume.so"
-LIBS="$LIBS libretro-mednafen-psx/libretro-mednafen-psx.so"
-LIBS="$LIBS libretro-mednafen-pce/libretro-mednafen-pce.so"
-LIBS="$LIBS libretro-mednafen-wswan/libretro-mednafen-wswan.so"
-LIBS="$LIBS libretro-mednafen-ngp/libretro-mednafen-ngp.so"
+LIBS="$LIBS libretro-mednafen/libretro-mednafen-psx.so"
+LIBS="$LIBS libretro-mednafen/libretro-mednafen-pce-fast.so"
+LIBS="$LIBS libretro-mednafen/libretro-mednafen-wswan.so"
 
 for lib in $LIBS
 do