diff --git a/libretro-build-win32.sh b/libretro-build-win32.sh
index 8366bbcb..29fe4a33 100755
--- a/libretro-build-win32.sh
+++ b/libretro-build-win32.sh
@@ -160,6 +160,34 @@ build_libretro_meteor()
    fi
 }
 
+build_libretro_stella()
+{
+   if [ -d "libretro-stella" ]; then
+      echo "=== Building Stella ==="
+      cd libretro-stella
+      make platform=win CC=$CC CXX=$CXX -j4 || die "Failed to build Stella"
+      cp retro.dll libretro-git-stella.dll
+      cd ../
+   else
+      echo "Stella not fetched, skipping ..."
+   fi
+}
+
+MEDNAFEN_VER=0924
+
+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_s9x
 build_libretro_s9x_next
@@ -170,4 +198,9 @@ build_libretro_bnes
 build_libretro_fceu
 build_libretro_gambatte
 build_libretro_meteor
+build_libretro_stella
+build_libretro_mednafen psx PSX
+build_libretro_mednafen pce PCE
+build_libretro_mednafen wswan WSwan
+build_libretro_mednafen ngp NGP
 
diff --git a/libretro-build.sh b/libretro-build.sh
index e4decba4..a87c8019 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -185,16 +185,30 @@ build_libretro_prboom()
    fi
 }
 
-build_libretro_mednafen_psx()
+build_libretro_stella()
 {
-   if [ -d "libretro-mednafen-psx" ]; then
-      echo "=== Building Mednafen/PSX ==="
-      cd libretro-mednafen-psx
-      make -j4 || die "Failed to build Mednafen/PSX"
-      cp libretro.so libretro-mednafen-psx.so
+   if [ -d "libretro-stella" ]; then
+      echo "=== Building Stella ==="
+      cd libretro-stella
+      make -j4 || die "Failed to build Stella"
+      cp libretro.so libretro-stella.so
       cd ../
    else
-      echo "Mednafen/PSX not fetched, skipping ..."
+      echo "Stella not fetched, skipping ..."
+   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
 }
 
@@ -210,5 +224,9 @@ build_libretro_gambatte
 build_libretro_meteor
 build_libretro_nx
 build_libretro_prboom
-build_libretro_mednafen_psx
+build_libretro_stella
+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 3c9e5fa1..b4307938 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -64,4 +64,8 @@ fetch_project "$REPO_BASE/libretro/meteor-libretro.git" "libretro-meteor" "libre
 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/stella-libretro.git" "libretro-stella" "libretro/Stella"
 
diff --git a/libretro-install-win32.sh b/libretro-install-win32.sh
index 16040318..a8c2d90f 100755
--- a/libretro-install-win32.sh
+++ b/libretro-install-win32.sh
@@ -12,6 +12,8 @@ if [ ! -d "$LIBRETRO_DIR" ]; then
    mkdir -p "$LIBRETRO_DIR"
 fi
 
+MEDNAFEN_VER=0924
+
 LIBS=""
 LIBS="$LIBS libretro-bsnes/libretro-089-bsnes-performance.dll"
 LIBS="$LIBS libretro-bsnes/libretro-089-bsnes-compat.dll"
@@ -25,6 +27,11 @@ LIBS="$LIBS libretro-fceu/libretro-git-fceu.dll"
 LIBS="$LIBS libretro-bnes/libretro-git-bnes.dll"
 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-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"
 
 for lib in $LIBS
 do
diff --git a/libretro-install.sh b/libretro-install.sh
index 1f3844c1..25a97621 100755
--- a/libretro-install.sh
+++ b/libretro-install.sh
@@ -25,7 +25,11 @@ LIBS="$LIBS libretro-gambatte/libretro-gambatte.so"
 LIBS="$LIBS libretro-meteor/libretro-meteor.so"
 LIBS="$LIBS libretro-nx/libretro-nx.so"
 LIBS="$LIBS libretro-prboom/libretro-prboom.so"
+LIBS="$LIBS libretro-stella/libretro-stella.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"
 
 for lib in $LIBS
 do