diff --git a/libretro-build-win32.sh b/libretro-build-win32.sh
index beff476f..c016833f 100755
--- a/libretro-build-win32.sh
+++ b/libretro-build-win32.sh
@@ -41,6 +41,31 @@ build_libretro_bsnes()
    fi
 }
 
+build_libretro_mednafen()
+{
+   if [ -d "libretro-mednafen" ]; then
+      echo "=== Building Mednafen ==="
+      cd libretro-mednafen
+
+      cd psx
+      make core=psx platform=win CC=$CC CXX=$CXX -j4 || die "Failed to build mednafen/psx"
+      cp retro.dll ../libretro-0926-mednafen-psx.dll
+      cd ..
+
+      cd pce-fast
+      make core=pce-fast platform=win CC=$CC CXX=$CXX -j4 || die "Failed to build mednafen/pce-fast"
+      cp retro.dll ../libretro-0924-mednafen-pce-fast.dll
+      cd ..
+
+      cd wswan
+      make core=wswan platform=win CC=$CC CXX=$CXX -j4 || die "Failed to build mednafen/wswan"
+      cp retro.dll ../libretro-0922-mednafen-wswan.dll
+      cd ..
+   else
+      echo "Mednafen not fetched, skipping ..."
+   fi
+}
+
 build_libretro_s9x()
 {
    if [ -d "libretro-s9x" ]; then
@@ -185,22 +210,8 @@ build_libretro_desmume()
    fi
 }
 
-MEDNAFEN_VER=0926
-
-build_libretro_mednafen()
-{
-   if [ -d "libretro-mednafen-${1}" ]; then
-      echo "=== Building Mednafen/${2} ==="
-      cd libretro-mednafen-${1}
-      make platform=win CC=$CC CXX=$CXX -j4 || die "Failed to build Mednafen/${2}"
-      cp retro.dll libretro-${MEDNAFEN_VER}-mednafen-${1}.dll
-      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
@@ -212,8 +223,4 @@ build_libretro_gambatte
 build_libretro_meteor
 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-install-win32.sh b/libretro-install-win32.sh
index 702cacc1..b1fe6ba5 100755
--- a/libretro-install-win32.sh
+++ b/libretro-install-win32.sh
@@ -12,8 +12,6 @@ if [ ! -d "$LIBRETRO_DIR" ]; then
    mkdir -p "$LIBRETRO_DIR"
 fi
 
-MEDNAFEN_VER=0926
-
 LIBS=""
 LIBS="$LIBS libretro-bsnes/libretro-089-bsnes-performance.dll"
 LIBS="$LIBS libretro-bsnes/libretro-089-bsnes-compat.dll"
@@ -29,10 +27,9 @@ LIBS="$LIBS libretro-gambatte/libretro-git-gambatte.dll"
 LIBS="$LIBS libretro-meteor/libretro-git-meteor.dll"
 LIBS="$LIBS libretro-stella/libretro-git-stella.dll"
 LIBS="$LIBS libretro-desmume/libretro-git-desmume.dll"
-LIBS="$LIBS libretro-mednafen-psx/libretro-${MEDNAFEN_VER}-mednafen-psx.dll"
-LIBS="$LIBS libretro-mednafen-pce/libretro-${MEDNAFEN_VER}-mednafen-pce.dll"
-LIBS="$LIBS libretro-mednafen-wswan/libretro-${MEDNAFEN_VER}-mednafen-wswan.dll"
-LIBS="$LIBS libretro-mednafen-ngp/libretro-${MEDNAFEN_VER}-mednafen-ngp.dll"
+LIBS="$LIBS libretro-mednafen/libretro-0926-mednafen-psx.dll"
+LIBS="$LIBS libretro-mednafen/libretro-0924-mednafen-pce.dll"
+LIBS="$LIBS libretro-mednafen/libretro-0922-mednafen-wswan.dll"
 
 for lib in $LIBS
 do