diff --git a/build-config.sh b/build-config.sh
index 4f7101b8..f725202f 100644
--- a/build-config.sh
+++ b/build-config.sh
@@ -26,7 +26,7 @@ include_core_bsnes_mercury_performance
 include_core_mednafen_snes
 
 # --- Dreamcast emulator cores ---
-include_core_reicast
+include_core_flycast
 include_core_redream
 
 # --- Genesis emulator cores ---
@@ -38,7 +38,7 @@ include_core_blastem
 include_core_gearsystem
 
 # --- Arcade emulator cores ---
-include_core_fbalpha
+include_core_fbneo
 include_core_fbalpha2012
 include_core_fbalpha2012_cps1
 include_core_fbalpha2012_cps2
@@ -133,6 +133,7 @@ include_core_virtualjaguar
 # --- DOS/PC/MAC emulator cores ---
 include_core_basilisk2
 include_core_dosbox
+include_core_dosbox_svn
 include_core_pcem
 
 # --- MAME cores ---
@@ -176,10 +177,16 @@ include_core_4do
 include_core_fuse
 include_core_81
 
+# --- NEC PC-88 emulator cores ---
+include_core_quasi88
+
 # --- NEC PC-98 emulator cores ---
 include_core_nekop2
 include_core_np2kai
 
+# --- Fairchild ChannelF cores ---
+include_core_freechaf
+
 # --- Sharp X-68000 emulator cores ---
 include_core_px68k
 
@@ -225,6 +232,7 @@ include_core_pocketcdg
 include_core_crocods
 include_core_cap32
 include_core_mu
+include_core_squirreljme
 include_core_minivmac
 include_core_oberon
 
diff --git a/dist/info/chailove_libretro.info b/dist/info/chailove_libretro.info
index 9d681c24..78684b82 100644
--- a/dist/info/chailove_libretro.info
+++ b/dist/info/chailove_libretro.info
@@ -8,5 +8,5 @@ systemid = "chailove"
 database = "ChaiLove"
 license = "MIT"
 permissions = ""
-display_version = "0.31.0"
+display_version = "0.32.0"
 supports_no_game = "false"
diff --git a/dist/info/fbalpha_libretro.info b/dist/info/fbalpha_libretro.info
deleted file mode 100644
index a1ed7f7d..00000000
--- a/dist/info/fbalpha_libretro.info
+++ /dev/null
@@ -1,15 +0,0 @@
-display_name = "Arcade (FB Alpha)"
-authors = "Team FB Alpha"
-supported_extensions = "zip|7z"
-corename = "FB Alpha"
-manufacturer = "Various"
-categories = "Emulator"
-systemname = "Arcade (various)"
-systemid = "fb_alpha"
-database = "FB Alpha - Arcade Games"
-database_match_archive_member = "true"
-license = "Non-commercial"
-permissions = ""
-display_version = "v0.2.97.44"
-supports_no_game = "false"
-notes = "(!) The BIOS files must be inside the ROM directory.|(!) You need a copy of neocdz.zip and neogeo.zip in your libretro system directory for neocd"
diff --git a/dist/info/fbneo_libretro.info b/dist/info/fbneo_libretro.info
new file mode 100644
index 00000000..58dd39e6
--- /dev/null
+++ b/dist/info/fbneo_libretro.info
@@ -0,0 +1,46 @@
+display_name = "Arcade (FinalBurn Neo)"
+authors = "Team FBNeo"
+supported_extensions = "zip|7z"
+corename = "FinalBurn Neo"
+manufacturer = "Various"
+categories = "Emulator"
+systemname = "Arcade (various)"
+systemid = "fb_alpha"
+database = "FBNeo - Arcade Games"
+database_match_archive_member = "true"
+license = "Non-commercial"
+permissions = ""
+display_version = "v0.2.97.44"
+supports_no_game = "false"
+firmware_count = 10
+firmware0_desc = "neogeo.zip (Neo Geo BIOS)"
+firmware0_path = "fbneo/neogeo.zip"
+firmware0_opt = "true"
+firmware1_desc = "neocdz.zip (Neo Geo CDZ System BIOS)"
+firmware1_path = "fbneo/neocdz.zip"
+firmware1_opt = "true"
+firmware2_desc = "decocass.zip (DECO Cassette System BIOS)"
+firmware2_path = "fbneo/decocass.zip"
+firmware2_opt = "true"
+firmware3_desc = "isgsm.zip (ISG Selection Master Type 2006 System BIOS)"
+firmware3_path = "fbneo/isgsm.zip"
+firmware3_opt = "true"
+firmware4_desc = "midssio.zip (Midway SSIO Sound Board Internal ROM)"
+firmware4_path = "fbneo/midssio.zip"
+firmware4_opt = "true"
+firmware5_desc = "nmk004.zip (NMK004 Internal ROM)"
+firmware5_path = "fbneo/nmk004.zip"
+firmware5_opt = "true"
+firmware6_desc = "pgm.zip (PGM System BIOS)"
+firmware6_path = "fbneo/pgm.zip"
+firmware6_opt = "true"
+firmware7_desc = "skns.zip (Super Kaneko Nova System BIOS)"
+firmware7_path = "fbneo/skns.zip"
+firmware7_opt = "true"
+firmware8_desc = "ym2608.zip (YM2608 Internal ROM)"
+firmware8_path = "fbneo/ym2608.zip"
+firmware8_opt = "true"
+firmware9_desc = "cchip.zip (C-Chip Internal ROM)"
+firmware9_path = "fbneo/cchip.zip"
+firmware9_opt = "true"
+notes = "(!) The BIOS files can also be inside the ROM directory or the root of SYSTEM directory.|(!) Homepage : https://neo-source.com/"
diff --git a/dist/info/reicast_libretro.info b/dist/info/flycast_libretro.info
similarity index 94%
rename from dist/info/reicast_libretro.info
rename to dist/info/flycast_libretro.info
index db1bb5ac..12992e32 100644
--- a/dist/info/reicast_libretro.info
+++ b/dist/info/flycast_libretro.info
@@ -1,7 +1,7 @@
-display_name = "Sega - Dreamcast/NAOMI (Reicast)"
-authors = "skmp|flyinghead"
+display_name = "Sega - Dreamcast/NAOMI (Flycast)"
+authors = "flyinghead"
 supported_extensions = "chd|cdi|iso|elf|bin|cue|gdi|lst|zip|dat|7z"
-corename = "Reicast"
+corename = "Flycast"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega Dreamcast"
diff --git a/dist/info/reicast_wince_libretro.info b/dist/info/flycast_wince_libretro.info
similarity index 94%
rename from dist/info/reicast_wince_libretro.info
rename to dist/info/flycast_wince_libretro.info
index ffafe355..288903c8 100644
--- a/dist/info/reicast_wince_libretro.info
+++ b/dist/info/flycast_wince_libretro.info
@@ -1,7 +1,7 @@
-display_name = "Sega - Dreamcast/NAOMI (Reicast WinCE)"
-authors = "skmp|flyinghead"
+display_name = "Sega - Dreamcast/NAOMI (Flycast WinCE)"
+authors = "flyinghead"
 supported_extensions = "chd|cdi|iso|elf|bin|cue|gdi|lst|zip|dat|7z"
-corename = "Reicast WinCE"
+corename = "Flycast WinCE"
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Sega Dreamcast"
diff --git a/dist/info/mu_libretro.info b/dist/info/mu_libretro.info
index c82c340d..b3700567 100644
--- a/dist/info/mu_libretro.info
+++ b/dist/info/mu_libretro.info
@@ -1,15 +1,21 @@
 display_name = "Palm OS (Mu)"
 authors = "guicrith / meepingsnesroms"
-supported_extensions = "rom"
+supported_extensions = "prc|pqa|img"
 corename = "Mu"
 manufacturer = "Palm"
 categories = "Emulator"
 systemname = "Palm OS"
 license = "Non-commercial"
 permissions = ""
-display_version = "v1/3*3"
-supports_no_game = "false"
-firmware_count = 1
-firmware0_desc = "bootloader-en-m515.rom (MC68VZ328 UART Bootloader)"
-firmware0_path = "bootloader-en-m515.rom"
+display_version = "v1.1.0"
+supports_no_game = "true"
+firmware_count = 3
+firmware0_desc = "palmos41-en-m515.rom (Palm OS 4.1)"
+firmware0_path = "palmos41-en-m515.rom"
 firmware0_opt = "true"
+firmware1_desc = "palmos52-en-t3.rom (Palm OS 5.2.1)"
+firmware1_path = "palmos52-en-t3.rom"
+firmware1_opt = "true"
+firmware2_desc = "bootloader-en-m515.rom (MC68VZ328 UART Bootloader)"
+firmware2_path = "bootloader-en-m515.rom"
+firmware2_opt = "true"
diff --git a/dist/info/pcsx_rearmed_interpreter_libretro.info b/dist/info/pcsx_rearmed_interpreter_libretro.info
index 8d1c033d..2036dfd2 100644
--- a/dist/info/pcsx_rearmed_interpreter_libretro.info
+++ b/dist/info/pcsx_rearmed_interpreter_libretro.info
@@ -1,6 +1,6 @@
 display_name = "Sony - PlayStation (PCSX ReARMed) [Interpreter]"
 authors = "PCSX Team|notaz|Exophase"
-supported_extensions = "bin|cue|img|mdf|pbp|cbn|toc"
+supported_extensions = "bin|cue|img|mdf|pbp|cbn|toc|chd"
 corename = "PCSX ReARMed [Interpreter]"
 manufacturer = "Sony"
 categories = "Emulator"
diff --git a/dist/info/pcsx_rearmed_libretro.info b/dist/info/pcsx_rearmed_libretro.info
index 151f1a2f..3cb80840 100644
--- a/dist/info/pcsx_rearmed_libretro.info
+++ b/dist/info/pcsx_rearmed_libretro.info
@@ -1,6 +1,6 @@
 display_name = "Sony - PlayStation (PCSX ReARMed)"
 authors = "PCSX Team|notaz|Exophase"
-supported_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u|ccd"
+supported_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u|ccd|chd"
 corename = "PCSX-ReARMed"
 manufacturer = "Sony"
 categories = "Emulator"
diff --git a/dist/info/pcsx_rearmed_libretro_neon.info b/dist/info/pcsx_rearmed_libretro_neon.info
index 51e91c0b..641792a8 100644
--- a/dist/info/pcsx_rearmed_libretro_neon.info
+++ b/dist/info/pcsx_rearmed_libretro_neon.info
@@ -1,6 +1,6 @@
 display_name = "Sony - PlayStation (PCSX ReARMed) [NEON]"
 authors = "PCSX Team|notaz|Exophase"
-supported_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u"
+supported_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u|chd"
 corename = "PCSX ReARMed [NEON]"
 manufacturer = "Sony"
 categories = "Emulator"
diff --git a/dist/info/quasi88_libretro.info b/dist/info/quasi88_libretro.info
new file mode 100644
index 00000000..4dd805fa
--- /dev/null
+++ b/dist/info/quasi88_libretro.info
@@ -0,0 +1,45 @@
+display_name = "NEC - PC-8001 / PC-8801 (QUASI88)"
+authors = "Showzoh Fukunaga"
+supported_extensions = "d88"
+corename = "QUASI88"
+manufacturer = "NEC"
+categories = "Emulator"
+systemname = "PC-8001 / PC-8801"
+systemid = "pc_88"
+database = ""
+license = "BSD 3-Clause"
+permissions = ""
+display_version = "0.6.4"
+supports_no_game = "true"
+firmware_count = 10
+firmware0_desc = "n88.rom (Main BIOS)"
+firmware0_path = "quasi88/n88.rom"
+firmware0_opt = "false"
+firmware1_desc = "n88_0.rom (Extension BIOS 1)"
+firmware1_path = "quasi88/n88_0.rom"
+firmware1_opt = "false"
+firmware2_desc = "n88_1.rom (Extension BIOS 2)"
+firmware2_path = "quasi88/n88_1.rom"
+firmware2_opt = "true"
+firmware3_desc = "n88_2.rom (Extension BIOS 3)"
+firmware3_path = "quasi88/n88_2.rom"
+firmware3_opt = "true"
+firmware4_desc = "n88_3.rom (Extension BIOS 4)"
+firmware4_path = "quasi88/n88_3.rom"
+firmware4_opt = "true"
+firmware5_desc = "n88n.rom (N Basic BIOS)"
+firmware5_path = "quasi88/n88n.rom"
+firmware5_opt = "true"
+firmware6_desc = "disk.rom (Sub BIOS)"
+firmware6_path = "quasi88/disk.rom"
+firmware6_opt = "true"
+firmware7_desc = "n88knji1.rom (Kanji Font 1)"
+firmware7_path = "quasi88/n88knji1.rom"
+firmware7_opt = "true"
+firmware8_desc = "n88knji2.rom (Kanji Font 2)"
+firmware8_path = "quasi88/n88knji2.rom"
+firmware8_opt = "true"
+firmware9_desc = "n88jisho.rom (Jisho)"
+firmware9_path = "quasi88/n88jisho.rom"
+firmware9_opt = "true"
+notes = "QUASI88 by Showzoh Fukunaga.|Sound driver by MAME team.|fmgen by cisc.|libretro port by Celerizer.| |BSD 3-Clause License| |Redistribution and use in source and binary|forms, with or without modification, are permitted|provided that the following conditions are met:| |1. Redistributions of source code must retain the|   above copyright notice, this list of conditions and|   the following disclaimer.| |2. Redistributions in binary form must reproduce the|   above copyright notice, this list of conditions and|   the following disclaimer in the documentation and/or|   other materials provided with the distribution.| |3. Neither the name of the copyright holder nor the|   names of its contributors may be used to endorse or|   promote products derived from this software without|   specific prior written permission.| |THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND|CONTRIBUTORS ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,|INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF|MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE|DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR|CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,|SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT|NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;|LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)|HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN|CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR|OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,|EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
\ No newline at end of file
diff --git a/dist/info/squirreljme_libretro.info b/dist/info/squirreljme_libretro.info
new file mode 100644
index 00000000..e86a8f84
--- /dev/null
+++ b/dist/info/squirreljme_libretro.info
@@ -0,0 +1,49 @@
+# Name displayed when the user is selecting the core:
+display_name = "Java ME (SquirrelJME)"
+
+# Name of the authors who wrote the core:
+authors = "Stephanie Gawroriski (Xer Shadow Tail)"
+
+# List of extensions the core supports:
+supported_extensions = "jar"
+
+# Name of the core:
+corename = "SquirrelJME"
+
+# Name of the manufacturer who produced the emulated system:
+manufacturer = "Oracle Corporation"
+
+# Categories that the core belongs to (optional):
+categories = "Emulator"
+
+# Name of the system that the core targets (optional):
+systemname = "Java ME"
+
+# ID of the primary platform the core uses.
+# Use other core info files as guidance if possible.
+# If blank or not used, a standard core platform will be used (optional):
+systemid = "J2ME"
+
+# Name of the database that the core supports (optional):
+database = "J2ME"
+
+# License of the cores source code:
+license = "GPLv3"
+
+# Privacy-specific permissions needed for using the core:
+permissions = ""
+
+# Version of the core:
+display_version = "0.4.0"
+
+# Whether or not the core requires an external file to work:
+supports_no_game = "true"
+
+# The number of mandatory/optional firmware files the core needs:
+firmware_count = 1
+firmware0_desc = "squirreljme.sqc (SquirrelJME Compiled SummerCoat ROM)"
+firmware0_path = "squirreljme.sqc"
+firmware0_opt = "false"
+
+# Additional notes:
+#notes = "(!) hash|(!) game rom|(^) continue|[1] notes|[^] continue|[*] list"
diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 8b0fb5d9..5f3f22c3 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -336,12 +336,12 @@ build_libretro_test() {
 	build_dir="$WORKDIR/retroarch"
 
 	if build_should_skip "test" "$build_dir"; then
-		echo "Core test is already built, skipping..."
+		echo 'Core test is already built, skipping...'
 		return
 	fi
 
 	if [ -d "$build_dir" ]; then
-		echo "=== Building RetroArch test cores ==="
+		echo '=== Building RetroArch test cores ==='
 		if check_opengl; then
 			build_libretro_generic "retroarch" "cores/libretro-test-gl" "Makefile" $FORMAT_COMPILER_TARGET "$build_dir"
 			copy_core_to_dist "testgl"
diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index 54e5812a..01b57945 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -251,6 +251,8 @@ build_libretro_databases() {
 	build_libretro_database "Coleco - ColecoVision" "rom.crc"
 	build_libretro_database "Commodore - 64" "rom.crc"
 	build_libretro_database "Commodore - Amiga" "rom.crc"
+	build_libretro_database "Commodore - Plus-4" "rom.crc"
+	build_libretro_database "Commodore - VIC-20" "rom.crc"
 	build_libretro_database "Dinothawr" "rom.crc"
 	build_libretro_database "Emerson - Arcadia 2001" "rom.crc"
 	build_libretro_database "Entex - Adventure Vision" "rom.crc"
diff --git a/libretro-build-ios10.sh b/libretro-build-ios10.sh
new file mode 100644
index 00000000..7f51772c
--- /dev/null
+++ b/libretro-build-ios10.sh
@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+# vim: set ts=3 sw=3 noet ft=sh : bash
+
+SCRIPT="${0#./}"
+BASE_DIR="${SCRIPT%/*}"
+WORKDIR="$PWD"
+
+if [ "$BASE_DIR" = "$SCRIPT" ]; then
+	BASE_DIR="$WORKDIR"
+else
+	if [[ "$0" != /* ]]; then
+		# Make the path absolute
+		BASE_DIR="$WORKDIR/$BASE_DIR"
+	fi
+fi
+
+platform=ios10 ${BASE_DIR}/libretro-build.sh $@
diff --git a/libretro-build.sh b/libretro-build.sh
index 717af8ef..3c8d9fb5 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -161,7 +161,7 @@ build_default_cores() {
 	libretro_build_core snes9x2005
 	if [ $platform != "psp1" ]; then
 		# Excluded for binary size reasons
-		libretro_build_core fbalpha
+		libretro_build_core fbneo
 	fi
 	libretro_build_core fceumm
 	libretro_build_core fmsx
diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index c0c5a6bc..19459991 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # vim: set ts=3 sw=3 noet ft=sh : bash
 # ----- setup -----
+export LC_ALL=C
 
 # This will use an overridden value from the command-line if provided, otherwise just use the current date
 BOT="${BOT:-.}"
@@ -48,7 +49,7 @@ read_link()
 	done
 	PHYS_DIR=$(pwd -P)
 	RESULT="$PHYS_DIR/$TARGET_FILE"
-	echo $RESULT
+	echo "$RESULT"
 }
 
 convert_xmb_assets()
@@ -121,11 +122,11 @@ if [ "${CORE_JOB}" == "YES" ]; then
 
 	if [ "${PLATFORM}" = "android" ]; then
 		if [ -n "$ABI_OVERRIDE" ]; then
-			echo ABIS-pre: $TARGET_ABIS
-			echo OVERRIDE: ${ABI_OVERRIDE}
+			echo "ABIS-pre: $TARGET_ABIS"
+			echo "OVERRIDE: ${ABI_OVERRIDE}"
 			TARGET_ABIS=${ABI_OVERRIDE}
 			export TARGET_ABIS=${ABI_OVERRIDE}
-			echo ABIS-post: $TARGET_ABIS
+			echo "ABIS-post: $TARGET_ABIS"
 		fi
 		IFS=' ' read -ra ABIS <<< "$TARGET_ABIS"
 		for a in "${ABIS[@]}"; do
@@ -229,7 +230,7 @@ cd "${BASE_DIR}"
 
 buildbot_log() {
 
-	echo buildbot message: $MESSAGE
+	echo "buildbot message: $MESSAGE"
 	MESSAGE=`echo -e $1`
 
 	if  [ -n "$LOGURL" ]; then
@@ -273,7 +274,7 @@ buildbot_handle_message() {
 		fi
 	fi
 
-	echo buildbot job: $MESSAGE
+	echo "buildbot job: $MESSAGE"
 	buildbot_log "$MESSAGE"
 
 	# used by Travis-CI to exit immediately if a core build fails, instead of trying to build RA anyways (for static/console builds)
@@ -345,14 +346,14 @@ build_libretro_generic_makefile() {
 			OUTPUT="$RARCH_DIST_DIR/${DIST}/${CORENAM}"
 		fi
 
-		echo -------------------------------------------------- | tee "$LOGFILE"
+		echo '--------------------------------------------------' | tee "$LOGFILE"
 		cat $TMPDIR/vars | tee -a "$LOGFILE"
 
-		echo -------------------------------------------------- | tee -a "$LOGFILE"
+		echo '--------------------------------------------------' | tee -a "$LOGFILE"
 		if [ -z "${NOCLEAN}" ] && [ -f "${MAKEFILE}" ] && [ "${COMMAND}" != "CMAKE" ]; then
 			if [ "${NAME}" = "higan_sfc" ] || [ "${NAME}" = "higan_sfc_balanced" ]; then
-				rm -fv obj/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE"
-				rm -fv out/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE"
+				rm -f obj/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE"
+				rm -f out/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE"
 			elif [ "${COMMAND}" = "LEIRADEL" ]; then
 				eval "set -- ${HELPER} ${MAKE} -f ${MAKEFILE}.${PLATFORM}_${ARG1} platform=${PLATFORM}_${CORE_ARGS} -j${JOBS} clean"
 				echo "CLEANUP CMD: $*" 2>&1 | tee -a "$LOGFILE"
@@ -364,13 +365,13 @@ build_libretro_generic_makefile() {
 			fi
 
 			if [ $? -eq 0 ]; then
-				echo buildbot job: $jobid ${core} cleanup success!
+				echo "buildbot job: $jobid ${core} cleanup success!"
 			else
-				echo buildbot job: $jobid ${core} cleanup failed!
+				echo "buildbot job: $jobid ${core} cleanup failed!"
 			fi
 		fi
 
-		echo -------------------------------------------------- | tee -a "$LOGFILE"
+		echo '--------------------------------------------------' | tee -a "$LOGFILE"
 		if [ "${COMMAND}" = "CMAKE" ]; then
 			if [ "${PLATFORM}" = "android" ]; then
 				EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \
@@ -426,9 +427,9 @@ build_libretro_generic_makefile() {
 			${NDK_ROOT}/${STRIPPATH} -s ${OUT}/${CORENAM}
 		fi
 
-		echo "COPY CMD: cp -v ${OUT}/${ORIGNAM} ${OUTPUT}" 2>&1 | tee -a "$LOGFILE"
-		cp -v "${OUT}/${ORIGNAM}" "${OUTPUT}" 2>&1 | tee -a "$LOGFILE"
-		cp -v "${OUT}/${ORIGNAM}" "${OUTPUT}"
+		echo "COPY CMD: cp ${OUT}/${ORIGNAM} ${OUTPUT}" 2>&1 | tee -a "$LOGFILE"
+		cp "${OUT}/${ORIGNAM}" "${OUTPUT}" 2>&1 | tee -a "$LOGFILE"
+		cp "${OUT}/${ORIGNAM}" "${OUTPUT}"
 
 		RET=$?
 		buildbot_handle_message "$RET" "$ENTRY_ID" "$core" "$jobid" "$LOGFILE"
@@ -486,22 +487,22 @@ build_libretro_generic_jni() {
 		fi
 
 		LOGFILE="$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${core}_${PLATFORM}.log"
-		echo -------------------------------------------------- | tee "$LOGFILE"
+		echo '--------------------------------------------------' | tee "$LOGFILE"
 		cat $TMPDIR/vars | tee -a "$LOGFILE"
 
-		echo -------------------------------------------------- | tee -a "$LOGFILE"
+		echo '--------------------------------------------------' | tee -a "$LOGFILE"
 		if [ -z "${NOCLEAN}" ]; then
 			echo "CLEANUP CMD: ${NDK} -j${JOBS} ${CORE_ARGS} clean" 2>&1 | tee -a "$LOGFILE"
 			${NDK} -j${JOBS} ${CORE_ARGS} clean 2>&1 | tee -a "$LOGFILE"
 
 			if [ $? -eq 0 ]; then
-				echo buildbot job: $jobid $a ${core} cleanup success!
+				echo "buildbot job: $jobid $a ${core} cleanup success!"
 			else
-				echo buildbot job: $jobid $a ${core} cleanup failed!
+				echo "buildbot job: $jobid $a ${core} cleanup failed!"
 			fi
 		fi
 
-		echo -------------------------------------------------- | tee -a "$LOGFILE"
+		echo '--------------------------------------------------' | tee -a "$LOGFILE"
 		eval "set -- ${NDK} -j${JOBS} ${CORE_ARGS}"
 		echo "BUILD CMD: $*" 2>&1 | tee -a "$LOGFILE"
 		"$@" 2>&1 | tee -a "$LOGFILE"
@@ -509,8 +510,8 @@ build_libretro_generic_jni() {
 		RET=0
 		for a in "${APPABIS[@]}"; do
 			if [ -f ../libs/${a}/$LIBNAM.${FORMAT_EXT} ]; then
-				echo "COPY CMD: cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${CORENAM}" 2>&1 | tee -a "$LOGFILE"
-				cp -v ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${CORENAM} 2>&1 | tee -a "$LOGFILE"
+				echo "COPY CMD: cp ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${CORENAM}" 2>&1 | tee -a "$LOGFILE"
+				cp ../libs/${a}/$LIBNAM.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${CORENAM} 2>&1 | tee -a "$LOGFILE"
 			else
 				echo "$LIBNAM.${FORMAT_EXT} for ${a} not found" 2>&1 | tee -a "$LOGFILE"
 				RET=1
@@ -525,14 +526,14 @@ build_libretro_generic_jni() {
 
 # ----- buildbot -----
 
-echo buildbot starting
-echo --------------------------------------------------
-echo Variables:
-echo CC		$CC
-echo CXX	  $CXX
-echo STRIP	$STRIP
-echo DISTDIR $RARCH_DIST_DIR
-echo JOBS	 $JOBS
+echo 'buildbot starting'
+echo '--------------------------------------------------'
+echo 'Variables:'
+echo "CC		$CC"
+echo "CXX	  $CXX"
+echo "STRIP	$STRIP"
+echo "DISTDIR $RARCH_DIST_DIR"
+echo "JOBS	 $JOBS"
 echo
 echo
 
@@ -582,14 +583,14 @@ while read line; do
 	echo "buildbot job started at: $(date)"
 	echo
 	echo "buildbot job: $jobid processing $NAME"
-	echo --------------------------------------------------
-	echo Variables:
-	echo URL		  $URL
-	echo ENABLED	 $ENABLED
-	echo COMMAND	 $COMMAND
-	echo MAKEFILE	$MAKEFILE
-	echo DIR		  $DIR
-	echo SUBDIR	  $SUBDIR
+	echo '--------------------------------------------------'
+	echo 'Variables:'
+	echo "URL		  $URL"
+	echo "ENABLED	 $ENABLED"
+	echo "COMMAND	 $COMMAND"
+	echo "MAKEFILE	$MAKEFILE"
+	echo "DIR		  $DIR"
+	echo "SUBDIR	  $SUBDIR"
 	echo
 	echo
 
@@ -598,7 +599,7 @@ while read line; do
 	FORCE_ORIG=$FORCE
 
 	if [ ! -d "${DIR}/.git" ] || [ "${CLEANUP}" = "YES" ]; then
-		rm -rfv -- "$DIR"
+		rm -rf -- "$DIR"
 		echo "cloning repo $URL..."
 		git clone --depth=1 -b "$GIT_BRANCH" "$URL" "$DIR"
 		BUILD="YES"
@@ -610,12 +611,12 @@ while read line; do
 
 		HEAD="$(git --work-tree="$DIR" --git-dir="$DIR/.git" rev-parse HEAD)" || \
 			{ echo "git directory broken, removing $DIR and skipping $NAME."; \
-			rm -rfv -- "$DIR" && continue; }
+			rm -rf -- "$DIR" && continue; }
 
 		OLDURL="$(git --work-tree="$DIR" --git-dir="$DIR/.git" config --get remote.origin.url)"
 
 		if [ "$URL" != "$OLDURL" ]; then
-			rm -rvf -- "$DIR"
+			rm -rf -- "$DIR"
 			echo "cloning repo $URL..."
 			git clone --depth=1 -b "$GIT_BRANCH" "$URL" "$DIR"
 			BUILD="YES"
@@ -717,12 +718,12 @@ buildbot_pull(){
 		if [ "${ENABLED}" = "YES" ] && [ "${TYPE}" = "PROJECT" ] || [ "${TRAVIS:-0}" = "0" ]; then
 			echo "buildbot job: $jobid Processing $NAME"
 			echo
-			echo NAME: $NAME
-			echo DIR: $DIR
-			echo PARENT: $PARENTDIR
-			echo URL: $URL
-			echo REPO TYPE: $TYPE
-			echo ENABLED: $ENABLED
+			echo "NAME: $NAME"
+			echo "DIR: $DIR"
+			echo "PARENT: $PARENTDIR"
+			echo "URL: $URL"
+			echo "REPO TYPE: $TYPE"
+			echo "ENABLED: $ENABLED"
 
 			if [ -d "${PARENTDIR}/${DIR}/.git" ]; then
 				cd $PARENTDIR
@@ -767,7 +768,7 @@ buildbot_pull(){
 				cd $WORK
 			fi
 			echo
-			echo RADIR=$RADIR
+			echo "RADIR=$RADIR"
 		fi
 
 	done < $RECIPE.ra
@@ -797,23 +798,23 @@ compile_filters()
 
 if [ "${RA}" = "YES" ]; then
 	echo "buildbot job: $jobid Building Retroarch-$PLATFORM"
-	echo --------------------------------------------------
+	echo '--------------------------------------------------'
 	echo
 	BUILD=""
 
-	echo WORKINGDIR=$PWD
-	echo RELEASE=$RELEASE
-	echo FORCE=$FORCE_RETROARCH_BUILD
-	echo RADIR=$RADIR
-	echo BRANCH=$BRANCH
+	echo "WORKINGDIR=$PWD"
+	echo "RELEASE=$RELEASE"
+	echo "FORCE=$FORCE_RETROARCH_BUILD"
+	echo "RADIR=$RADIR"
+	echo "BRANCH=$BRANCH"
 
 	buildbot_pull
 
 	if [ "${BUILD}" = "YES" ] || [ "${FORCE}" = "YES" ] || [ "${FORCE_RETROARCH_BUILD}" = "YES" ] || [ "${CORES_BUILT}" = "YES" ]; then
 		cd "$RADIR"
 		git clean -xdf
-		echo WORKINGDIR=$PWD
-		echo RADIR=$RADIR
+		echo "WORKINGDIR=$PWD"
+		echo "RADIR=$RADIR"
 
 		echo "buildbot job: $jobid Building"
 		echo
@@ -859,7 +860,7 @@ if [ "${PLATFORM}" == "osx" ] && [ "${RA}" == "YES" ]; then
 
 		cd $WORK/$RADIR
 
-		echo "Packaging"
+		echo 'Packaging'
 
 	fi
 fi
@@ -880,7 +881,7 @@ if [ "${PLATFORM}" == "ios" ] && [ "${RA}" == "YES" ]; then
 		ENTRY_ID=""
 		cd $WORK/$RADIR
 
-		echo "Packaging"
+		echo 'Packaging'
 
 	fi
 fi
@@ -907,7 +908,7 @@ if [ "${PLATFORM}" == "ios9" ] && [ "${RA}" == "YES" ]; then
 		ENTRY_ID=""
 		cd $WORK/$RADIR
 
-		echo "Packaging"
+		echo 'Packaging'
 
 	fi
 fi
@@ -1012,11 +1013,11 @@ EOF
 		android update project --path libs/appcompat --target android-26 | tee -a "$LOGFILE"
 		TARGET_ABIS=${TARGET_ABIS/arm64-v8a /} ant release | tee -a "$LOGFILE"
 		if [ -z "$BRANCH" ]; then
-			cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk | tee -a "$LOGFILE"
-			cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk
+			cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk | tee -a "$LOGFILE"
+			cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-release.apk
 		else
-			cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk | tee -a "$LOGFILE"
-			cp -rv bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk
+			cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk | tee -a "$LOGFILE"
+			cp -r bin/retroarch-release.apk $RARCH_DIR/retroarch-$BRANCH-release.apk
 		fi
 
 		RET=$?
@@ -1037,12 +1038,12 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO
 		compile_filters audio ${HELPER} ${MAKE}
 		compile_filters video ${HELPER} ${MAKE}
 
-		echo "configuring..."
+		echo 'configuring...'
 		echo "configure command: $CONFIGURE"
 		${CONFIGURE}
 
 
-		echo "cleaning up..."
+		echo 'cleaning up...'
 		echo "CLEANUP CMD: ${HELPER} ${MAKE} ${ARGS} clean"
 		${HELPER} ${MAKE} ${ARGS} clean
 
@@ -1050,19 +1051,19 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO
 		mkdir -p windows
 
 		if [ $? -eq 0 ]; then
-			echo buildbot job: $jobid retroarch cleanup success!
+			echo "buildbot job: $jobid retroarch cleanup success!"
 		else
-			echo buildbot job: $jobid retroarch cleanup failed!
+			echo "buildbot job: $jobid retroarch cleanup failed!"
 		fi
 
 
 		if [ $? -eq 0 ]; then
-			echo buildbot job: $jobid retroarch configure success!
+			echo "buildbot job: $jobid retroarch configure success!"
 		else
-			echo buildbot job: $jobid retroarch configure failed!
+			echo "buildbot job: $jobid retroarch configure failed!"
 		fi
 
-		echo "building..."
+		echo 'building...'
 		echo "BUILD CMD: ${HELPER} ${MAKE} -j${JOBS} ${ARGS}"
 		${HELPER} ${MAKE} -j${JOBS} ${ARGS} 2>&1 | tee -a "$LOGFILE"
 
@@ -1071,12 +1072,12 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO
 		fi
 
 		strip -s retroarch.exe
-		cp -v retroarch.exe.manifest windows/retroarch.exe.manifest 2>/dev/null
-		cp -v retroarch.exe windows/retroarch.exe | tee -a "$LOGFILE"
-		cp -v retroarch.exe windows/retroarch.exe
+		cp retroarch.exe.manifest windows/retroarch.exe.manifest 2>/dev/null
+		cp retroarch.exe windows/retroarch.exe | tee -a "$LOGFILE"
+		cp retroarch.exe windows/retroarch.exe
 
 		status=$?
-		echo $status
+		echo "$status"
 
 		buildbot_handle_message "$status" "$ENTRY_ID" "retroarch" "$jobid" "$LOGFILE"
 
@@ -1090,24 +1091,24 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO
 				ENTRY_ID=`curl -X POST -d type="start" -d master_log="$MASTER_LOG_ID" -d platform="$jobid" -d name="retroarch-debug" http://buildbot.fiveforty.net/build_entry/`
 			fi
 
-			echo "configuring..."
+			echo 'configuring...'
 			echo "configure command: $CONFIGURE"
 			${CONFIGURE} --enable-drmingw
 
 			${HELPER} ${MAKE} -j${JOBS} ${ARGS} DEBUG=1 GL_DEBUG=1 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log
-			for i in $(seq 3); do for bin in $(ntldd -R *exe | grep -i mingw | cut -d">" -f2 | cut -d" " -f2); do cp -vu "$bin" . ; done; done
+			for i in $(seq 3); do for bin in $(ntldd -R *exe | grep -i mingw | cut -d">" -f2 | cut -d" " -f2); do cp -u "$bin" . ; done; done
 
 			if [ "${CUSTOM_BUILD_DEBUG}" ]; then
 				"${CUSTOM_BUILD_DEBUG}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log
 			fi
 
-			cp -v retroarch.exe.manifest windows/retroarch_debug.exe.manifest 2>/dev/null
-			cp -v retroarch.exe windows/retroarch_debug.exe	| tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log
-			cp -v *.dll windows/
-			cp -v retroarch.exe windows/retroarch_debug.exe
+			cp retroarch.exe.manifest windows/retroarch_debug.exe.manifest 2>/dev/null
+			cp retroarch.exe windows/retroarch_debug.exe	| tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log
+			cp *.dll windows/
+			cp retroarch.exe windows/retroarch_debug.exe
 
 			(cd windows && windeployqt --release --no-patchqt --no-translations retroarch.exe)
-			(cd windows && for i in $(seq 3); do for bin in $(ntldd -R imageformats/*dll | grep -i mingw | cut -d">" -f2 | cut -d" " -f2); do cp -vu "$bin" . ; done; done)
+			(cd windows && for i in $(seq 3); do for bin in $(ntldd -R imageformats/*dll | grep -i mingw | cut -d">" -f2 | cut -d" " -f2); do cp -u "$bin" . ; done; done)
 
 			status=$?
 			ERROR=$TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_DEBUG_${PLATFORM}.log
@@ -1124,7 +1125,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO
 
 			ENTRY_ID=""
 
-			echo "Packaging"
+			echo 'Packaging'
 			cp retroarch.cfg retroarch.default.cfg
 			mkdir -p windows/filters
 			mkdir -p windows/filters/video
@@ -1134,8 +1135,8 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] || [ "${PLATFO
 			mkdir -p windows/system
 			mkdir -p windows/screenshots
 
-			cp -v retroarch.default.cfg windows/
-			cp -v tools/*.exe windows/
+			cp retroarch.default.cfg windows/
+			cp tools/*.exe windows/
 			echo -e "[Paths]\nPlugins = ./" > windows/qt.conf
 			cp -rf libretro-common/audio/dsp_filters/*.dll windows/filters/audio
 			cp -rf libretro-common/audio/dsp_filters/*.dsp windows/filters/audio
@@ -1155,7 +1156,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
 
 		cd dist-scripts
 		rm *.a
-		cp -v $RARCH_DIST_DIR/*.a .
+		cp $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh psp1 2>&1 | tee -a "$LOGFILE"
 
@@ -1168,14 +1169,14 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
 
 		ENTRY_ID=""
 
-		echo "Packaging"
+		echo 'Packaging'
 
 		cd $WORK/$RADIR
 		cp retroarch.cfg retroarch.default.cfg
 
 		mkdir -p pkg/psp1/
 		mkdir -p pkg/psp1/info
-		cp -v $RARCH_DIST_DIR/../info/*.info pkg/psp1/info/
+		cp $RARCH_DIST_DIR/../info/*.info pkg/psp1/info/
 
 	fi
 fi
@@ -1186,7 +1187,7 @@ if [ "${PLATFORM}" = "ps2" ] && [ "${RA}" = "YES" ]; then
 
 		cd dist-scripts
 		rm *.a
-		cp -v $RARCH_DIST_DIR/*.a .
+		cp $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh ps2 2>&1 | tee -a "$LOGFILE"
 
@@ -1199,14 +1200,14 @@ if [ "${PLATFORM}" = "ps2" ] && [ "${RA}" = "YES" ]; then
 
 		ENTRY_ID=""
 
-		echo "Packaging"
+		echo 'Packaging'
 
 		cd $WORK/$RADIR
 		cp retroarch.cfg retroarch.default.cfg
 
 		mkdir -p pkg/ps2/
 		mkdir -p pkg/ps2/info
-		cp -v $RARCH_DIST_DIR/../info/*.info pkg/ps2/info/
+		cp $RARCH_DIST_DIR/../info/*.info pkg/ps2/info/
 
 	fi
 fi
@@ -1219,7 +1220,7 @@ if [ "${PLATFORM}" == "libnx" ] && [ "${RA}" == "YES" ]; then
 
 		cd dist-scripts
 		rm *.a
-		cp -v $RARCH_DIST_DIR/*.a .
+		cp $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh libnx 2>&1 | tee -a "$LOGFILE"
 
@@ -1228,7 +1229,7 @@ if [ "${PLATFORM}" == "libnx" ] && [ "${RA}" == "YES" ]; then
 
 		ENTRY_ID=""
 
-		echo "Packaging"
+		echo 'Packaging'
 
 		cd $WORK/$RADIR
 		cp retroarch.cfg retroarch.default.cfg
@@ -1247,7 +1248,7 @@ if [ "${PLATFORM}" == "libnx" ] && [ "${RA}" == "YES" ]; then
 		cp -rf media/shaders_glsl/* pkg/libnx/retroarch/shaders
 		rm -rf pkg/libnx/retroarch/assets/src pkg/libnx/retroarch/assets/nuklear pkg/libnx/retroarch/assets/branding pkg/libnx/retroarch/assets/wallpapers pkg/libnx/retroarch/assets/zarch
 
-		cp -v $RARCH_DIST_DIR/../info/*.info pkg/libnx/retroarch/info
+		cp $RARCH_DIST_DIR/../info/*.info pkg/libnx/retroarch/info
 
 	fi
 fi
@@ -1260,7 +1261,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then
 
 		cd dist-scripts
 		rm *.a
-		cp -v $RARCH_DIST_DIR/*.a .
+		cp $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh wii 2>&1 | tee -a "$LOGFILE"
 
@@ -1269,16 +1270,31 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then
 
 		ENTRY_ID=""
 
-		echo "Packaging"
+		echo 'Packaging'
 
 		cd $WORK/$RADIR
+
 		cp retroarch.cfg retroarch.default.cfg
-		mkdir -p pkg/wii/
-		mkdir -p pkg/wii/cheats
-		mkdir -p pkg/wii/remaps
-		mkdir -p pkg/wii/overlays
-		cp -v $RARCH_DIST_DIR/../info/*.info pkg/
-		cp -rf media/overlays/wii/* pkg/wii/overlays
+
+		mkdir -p pkg/wii/build/apps/retroarch-wii
+		mkdir -p pkg/wii/build/apps/retroarch-wii/cheats
+		mkdir -p pkg/wii/build/apps/retroarch-wii/overlays
+		mkdir -p pkg/wii/build/apps/retroarch-wii/info
+		mkdir -p pkg/wii/build/apps/retroarch-wii/filters/audio
+		mkdir -p pkg/wii/build/apps/retroarch-wii/filters/video
+		mkdir -p pkg/wii/build/apps/retroarch-wii/assets
+
+		cp pkg/wii/icon.png pkg/wii/build/apps/retroarch-wii/
+		cp pkg/wii/meta.xml pkg/wii/build/apps/retroarch-wii/
+		cp pkg/wii/.empty pkg/wii/build/apps/retroarch-wii/
+		cp pkg/wii/*.dol pkg/wii/build/apps/retroarch-wii/
+
+		cp $RARCH_DIST_DIR/../info/*.info pkg/wii/build/apps/retroarch-wii/info/
+		cp -rf media/overlays/wii/* pkg/wii/build/apps/retroarch-wii/overlays/
+		cp $WORK/$RADIR/libretro-common/audio/dsp_filters/*.dsp pkg/wii/build/apps/retroarch-wii/filters/audio/
+		cp $WORK/$RADIR/gfx/video_filters/*.filt pkg/wii/build/apps/retroarch-wii/filters/video/
+		cp -r $WORK/$RADIR/media/assets/rgui pkg/wii/build/apps/retroarch-wii/assets/
+
 	fi
 fi
 
@@ -1290,9 +1306,9 @@ if [ "${PLATFORM}" == "wiiu" ] && [ "${RA}" == "YES" ]; then
 
 		cd dist-scripts
 		rm *.a
-		cp -v $RARCH_DIST_DIR/*.a .
-		cp -v $RARCH_DIST_DIR/../info/*.info .
-		cp -v ../media/assets/pkg/wiiu/*.png .
+		cp $RARCH_DIST_DIR/*.a .
+		cp $RARCH_DIST_DIR/../info/*.info .
+		cp ../media/assets/pkg/wiiu/*.png .
 
 		time sh ./wiiu-cores.sh 2>&1 | tee -a "$LOGFILE"
 
@@ -1301,7 +1317,7 @@ if [ "${PLATFORM}" == "wiiu" ] && [ "${RA}" == "YES" ]; then
 
 		ENTRY_ID=""
 
-		echo "Packaging"
+		echo 'Packaging'
 
 		cd $WORK/$RADIR
 	fi
@@ -1315,7 +1331,7 @@ if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; then
 
 		cd dist-scripts
 		rm *.a
-		cp -v $RARCH_DIST_DIR/*.a .
+		cp $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh ngc 2>&1 | tee -a "$LOGFILE"
 
@@ -1324,7 +1340,7 @@ if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; then
 
 		ENTRY_ID=""
 
-		echo "Packaging"
+		echo 'Packaging'
 
 		cd $WORK/$RADIR
 		cp retroarch.cfg retroarch.default.cfg
@@ -1332,7 +1348,7 @@ if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; then
 		mkdir -p pkg/ngc/cheats
 		mkdir -p pkg/ngc/remaps
 		mkdir -p pkg/ngc/overlays
-		cp -v $RARCH_DIST_DIR/../info/*.info pkg/
+		cp $RARCH_DIST_DIR/../info/*.info pkg/
 		cp -rf media/overlays/ngc/* pkg/ngc/overlays
 	fi
 fi
@@ -1345,7 +1361,7 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then
 
 		cd dist-scripts
 		rm *.a
-		cp -v $RARCH_DIST_DIR/*.a .
+		cp $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh ctr 2>&1 | tee -a "$LOGFILE"
 
@@ -1355,9 +1371,9 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then
 		ENTRY_ID=""
 
 		cd $WORK/$RADIR
-		echo $PWD
+		echo "$PWD"
 
-		echo "Packaging"
+		echo 'Packaging'
 
 		cp retroarch.cfg retroarch.default.cfg
 
@@ -1374,12 +1390,12 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then
 		mkdir -p $WORK/$RADIR/pkg/ctr/build/retroarch/database/cursors
 		mkdir -p $WORK/$RADIR/pkg/ctr/build/retroarch/media
 
-		cp -v $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/ctr/build/retroarch/filters/video/
-		cp -v $WORK/$RADIR/libretro-common/audio/dsp_filters/*.dsp $WORK/$RADIR/pkg/ctr/build/retroarch/filters/audio/
-		cp -v $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/ctr/build/retroarch/cores/info/
-		cp -v $WORK/$RADIR/media/libretrodb/rdb/*.rdb $WORK/$RADIR/pkg/ctr/build/retroarch/database/rdb/
-		cp -v $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/ctr/build/retroarch/database/cursors/
-		cp -rv $WORK/$RADIR/media/assets/rgui $WORK/$RADIR/pkg/ctr/build/retroarch/media/
+		cp $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/ctr/build/retroarch/filters/video/
+		cp $WORK/$RADIR/libretro-common/audio/dsp_filters/*.dsp $WORK/$RADIR/pkg/ctr/build/retroarch/filters/audio/
+		cp $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/ctr/build/retroarch/cores/info/
+		cp $WORK/$RADIR/media/libretrodb/rdb/*.rdb $WORK/$RADIR/pkg/ctr/build/retroarch/database/rdb/
+		cp $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/ctr/build/retroarch/database/cursors/
+		cp -r $WORK/$RADIR/media/assets/rgui $WORK/$RADIR/pkg/ctr/build/retroarch/media/
 
 		convert_xmb_assets $WORK/$RADIR/media/assets/xmb $WORK/$RADIR/pkg/ctr/build/retroarch/media/xmb 64x32! 400x240! 90
 	fi
@@ -1393,8 +1409,8 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then
 
 		cd dist-scripts
 		rm *.a
-		cp -v $RARCH_DIST_DIR/*.a .
-		cp -v $RARCH_DIST_DIR/arm/*.a .
+		cp $RARCH_DIST_DIR/*.a .
+		cp $RARCH_DIST_DIR/arm/*.a .
 
 		time sh ./dist-cores.sh vita 2>&1 | tee -a "$LOGFILE"
 
@@ -1403,7 +1419,7 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then
 
 		ENTRY_ID=""
 
-		echo "Packaging"
+		echo 'Packaging'
 
 		cd $WORK/$RADIR
 		cp retroarch.cfg retroarch.default.cfg
@@ -1421,12 +1437,12 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then
 		mkdir -p $WORK/$RADIR/pkg/vita/retroarch/assets/glui
 
 
-		cp -v $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/vita/retroarch/filters/video/
-		cp -v $WORK/$RADIR/libretro-common/audio/dsp_filters/*.dsp $WORK/$RADIR/pkg/vita/retroarch/filters/audio/
-		cp -v $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/vita/retroarch/info/
-		cp -v $WORK/$RADIR/media/libretrodb/rdb/*.rdb $WORK/$RADIR/pkg/vita/retroarch/database/rdb/
-		cp -v $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/vita/retroarch/database/cursors/
-		cp -v $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/vita/retroarch/database/cursors/
+		cp $WORK/$RADIR/gfx/video_filters/*.filt $WORK/$RADIR/pkg/vita/retroarch/filters/video/
+		cp $WORK/$RADIR/libretro-common/audio/dsp_filters/*.dsp $WORK/$RADIR/pkg/vita/retroarch/filters/audio/
+		cp $RARCH_DIST_DIR/../info/*.info $WORK/$RADIR/pkg/vita/retroarch/info/
+		cp $WORK/$RADIR/media/libretrodb/rdb/*.rdb $WORK/$RADIR/pkg/vita/retroarch/database/rdb/
+		cp $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/vita/retroarch/database/cursors/
+		cp  $WORK/$RADIR/media/libretrodb/cursors/*.dbc $WORK/$RADIR/pkg/vita/retroarch/database/cursors/
 		cp -r $WORK/$RADIR/media/assets/glui $WORK/$RADIR/pkg/vita/retroarch/assets
 		
 		convert_xmb_assets $WORK/$RADIR/media/assets/xmb $WORK/$RADIR/pkg/vita/retroarch/assets/xmb 64x64! 960x544! 90
@@ -1442,7 +1458,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then
 
 		cd dist-scripts
 		rm *.a
-		cp -v $RARCH_DIST_DIR/*.a .
+		cp $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh dex-ps3 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}_dex.log
 
@@ -1482,7 +1498,7 @@ if [ "${PLATFORM}" = "emscripten" ] && [ "${RA}" = "YES" ]; then
 
 		cd dist-scripts
 		rm *.a
-		cp -v $RARCH_DIST_DIR/*.bc .
+		cp $RARCH_DIST_DIR/*.bc .
 
 		echo "BUILD CMD $HELPER ./dist-cores.sh emscripten" &> "$LOGFILE"
 		$HELPER ./dist-cores.sh emscripten 2>&1 | tee -a "$LOGFILE"
@@ -1491,7 +1507,7 @@ if [ "${PLATFORM}" = "emscripten" ] && [ "${RA}" = "YES" ]; then
 		buildbot_handle_message "$RET" "$ENTRY_ID" "retroarch" "$jobid" "$LOGFILE"
 		ENTRY_ID=""
 
-		echo "Packaging"
+		echo 'Packaging'
 
 		cd $WORK/$RADIR
 	fi
@@ -1506,26 +1522,26 @@ if [ "${PLATFORM}" = "unix" ] && [ "${RA}" = "YES" ]; then
 		compile_filters audio ${HELPER} ${MAKE}
 		compile_filters video ${HELPER} ${MAKE}
 
-		echo "configuring..."
+		echo 'configuring...'
 		echo "configure command: $CONFIGURE $ARGS"
 		${CONFIGURE} ${ARGS}
 
-		echo "cleaning up..."
+		echo 'cleaning up...'
 		echo "CLEANUP CMD: ${HELPER} ${MAKE} clean"
 		${HELPER} ${MAKE} clean
 
 		if [ $? -eq 0 ]; then
-			echo buildbot job: $jobid retroarch cleanup success!
+			echo "buildbot job: $jobid retroarch cleanup success!"
 		else
-			echo buildbot job: $jobid retroarch cleanup failed!
+			echo "buildbot job: $jobid retroarch cleanup failed!"
 		fi
 
-		echo "building..."
+		echo 'building...'
 		echo "BUILD CMD: ${HELPER} ${MAKE} -j${JOBS}"
 		${HELPER} ${MAKE} -j${JOBS} 2>&1 | tee -a "$LOGFILE"
 
 		status=$?
-		echo $status
+		echo "$status"
 
 		buildbot_handle_message "$status" "$ENTRY_ID" "retroarch" "$jobid" "$LOGFILE"
 
diff --git a/libretro-config.sh b/libretro-config.sh
index f2b1456c..4d895234 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -240,15 +240,33 @@ case "$platform" in
 		CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
 		;;
 
+	ios10)
+		DIST_DIR="ios10"
+		FORMAT_EXT=dylib
+		IOS=1
+		ARCH=armv7 arm64
+		FORMAT=_ios
+		FORMAT_COMPILER_TARGET=ios10
+		FORMAT_COMPILER_TARGET_ALT=ios10
+		export IOSSDK=$(xcodebuild -version -sdk iphoneos Path)
+
+		# Use generic names rather than gcc/clang to better support both
+		CC="cc -arch armv7 -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
+		CXX="c++ -arch armv7 -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
+		CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
+		;;
+
 	ios-arm64)
-    DIST_DIR="ios-arm64"
-    FORMAT_EXT=dylib
-    IOS=1
-    ARCH=arm64
-    FORMAT=_ios
-    FORMAT_COMPILER_TARGET=ios-arm64
-    FORMAT_COMPILER_TARGET_ALT=ios-arm64
-    export IOSSDK=$(xcodebuild -version -sdk iphoneos Path)
+		DIST_DIR="ios-arm64"
+		FORMAT_EXT=dylib
+		IOS=1
+		ARCH=arm64
+		FORMAT=_ios
+		FORMAT_COMPILER_TARGET=ios-arm64
+		FORMAT_COMPILER_TARGET_ALT=ios-arm64
+		export IOSSDK=$(xcodebuild -version -sdk iphoneos Path)
+
+		# Use generic names rather than gcc/clang to better support both
 		CC="cc -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
 		CXX="c++ -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
 		CXX11="clang++ -std=c++11 -stdlib=libc++ -arch arm64 -marm -miphoneos-version-min=8.0 -isysroot $IOSSDK"
diff --git a/libretro-header-update.sh b/libretro-header-update.sh
index 7698e807..fd20a8e7 100755
--- a/libretro-header-update.sh
+++ b/libretro-header-update.sh
@@ -56,7 +56,6 @@ update_header_batch "libretro-fbalpha2012/svn-current/trunk/src/burner/libretro"
 update_header_batch "libretro-fbalpha2012_neogeo/src/burner/libretro"
 update_header_batch "libretro-fbalpha2012_cps2/src/burner/libretro"
 update_header_batch "libretro-fbalpha2012_neogeo/src/burner/libretro"
-update_header_batch "libretro-fbalpha/src/trunk/src/burner/libretro"
 update_header "libretro-vba_next/libretro" "libretro/VBA Next (6/55)"
 update_header "libretro-vbam/src/libretro" "libretro/VBA-M (7/55)"
 update_header "libretro-handy/libretro" "libretro/Handy (8/55)"
diff --git a/recipes/android/cores-android-jni b/recipes/android/cores-android-jni
index 55571a16..4d1a0e42 100644
--- a/recipes/android/cores-android-jni
+++ b/recipes/android/cores-android-jni
@@ -57,7 +57,7 @@ meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master NO
 mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC_JNI Makefile jni
 mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC_JNI Makefile libretroBuildSystem/jni
 mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni
-mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git mupen_next YES GENERIC_JNI Makefile libretro/jni
+mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_JNI Makefile libretro/jni
 mupen64plus_gles3 libretro-mupen64plus-gles3 https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni GLES3=1 APP_PLATFORM=android-18
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC_JNI Makefile.libretro libretro/jni
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC_JNI Makefile libretro/jni
@@ -74,8 +74,9 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC_JNI Makefile jni
 puae libretro-puae https://github.com/libretro/libretro-uae.git master YES GENERIC_JNI Makefile jni
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC_JNI Makefile.libretro libretro/jni
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC_JNI Makefile src/LIBRETRO/jni
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC_JNI Makefile jni
-reicast libretro-reicast https://github.com/libretro/reicast-emulator.git master YES GENERIC_JNI Makefile jni
+flycast libretro-flycast https://github.com/libretro/flycast.git master YES GENERIC_JNI Makefile jni
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC_JNI Makefile jni
 sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC_JNI Makefile libretro/jni
 scummvm libretro-scummvm https://github.com/libretro/scummvm.git master YES GENERIC_JNI Makefile backends/platform/libretro/build/jni
@@ -84,6 +85,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC_JNI Makefile jni
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC_JNI Makefile jni USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_JNI Makefile jni
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC_JNI makefilelibretro ratufacoat/libretro/jni
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC_JNI Makefile jni
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC_JNI Makefile src/libretro/jni
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC_JNI Makefile jni
diff --git a/recipes/android/cores-android-jni-new b/recipes/android/cores-android-jni-new
index bd6027d8..741cbb9b 100644
--- a/recipes/android/cores-android-jni-new
+++ b/recipes/android/cores-android-jni-new
@@ -1,4 +1,4 @@
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC_JNI Makefile.libretro libretro/jni
 dosbox_svn_glide libretro-dosbox_svn_glide https://github.com/fr500/dosbox-svn glide YES GENERIC_JNI Makefile.libretro libretro/jni
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC_JNI makefile.libretro jni
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC_JNI Makefile src/burner/libretro/jni
 yabasanshiro libretro-yabasanshiro https://github.com/libretro/yabause.git yabasanshiro YES GENERIC_JNI Makefile yabause/src/libretro/jni
diff --git a/recipes/apple/cores-ios-generic b/recipes/apple/cores-ios-generic
index b7cf915c..80062bc1 100644
--- a/recipes/apple/cores-ios-generic
+++ b/recipes/apple/cores-ios-generic
@@ -16,7 +16,7 @@ desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git mas
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -73,6 +73,7 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
@@ -81,6 +82,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_ALT Makefile.libretro .
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
@@ -100,3 +102,4 @@ uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENE
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
+test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
diff --git a/recipes/apple/cores-ios9-generic b/recipes/apple/cores-ios9-generic
index ae1841cd..17650099 100644
--- a/recipes/apple/cores-ios9-generic
+++ b/recipes/apple/cores-ios9-generic
@@ -15,7 +15,7 @@ desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git mas
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -72,6 +72,7 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
@@ -80,6 +81,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
@@ -99,3 +101,4 @@ uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENE
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
+test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
diff --git a/recipes/apple/cores-osx-x64-generic b/recipes/apple/cores-osx-x64-generic
index 4419a85b..e4363d61 100644
--- a/recipes/apple/cores-osx-x64-generic
+++ b/recipes/apple/cores-osx-x64-generic
@@ -20,7 +20,7 @@ dolphin libretro-dolphin https://github.com/libretro/dolphin.git master YES CMAK
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC Makefile.libretro libretro target=x86_64
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -83,10 +83,10 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
-reicast libretro-reicast https://github.com/libretro/reicast-emulator.git master YES GENERIC Makefile .
-reicast_wince libretro-reicast_wince https://github.com/libretro/reicast-emulator.git fh/wince YES GENERIC Makefile .
-redream libretro-redream https://github.com/libretro/redream.git master YES GENERIC Makefile deps/libretro
+flycast libretro-flycast https://github.com/libretro/flycast.git master YES GENERIC Makefile .
+flycast_wince libretro-flycast_wince https://github.com/libretro/flycast.git fh/wince YES GENERIC Makefile .
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
 sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC Makefile libretro
@@ -95,6 +95,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
@@ -116,3 +117,4 @@ uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master YES GENE
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
+test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
diff --git a/recipes/blackberry/cores-qnx-generic b/recipes/blackberry/cores-qnx-generic
index c762e655..3c404569 100644
--- a/recipes/blackberry/cores-qnx-generic
+++ b/recipes/blackberry/cores-qnx-generic
@@ -7,7 +7,7 @@ crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
 emux libretro-emux https://github.com/libretro/emux master YES LEIRADEL Makefile libretro | emux_chip8:MACHINE=chip8 emux_gb:MACHINE=gb emux_nes:MACHINE=nes emux_sms:MACHINE=sms
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -50,11 +50,13 @@ picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YE
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile .
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 scummvm libretro-scummvm https://github.com/libretro/scummvm.git master YES GENERIC Makefile backends/platform/libretro/build
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_ALT Makefile.libretro .
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
diff --git a/recipes/emscripten/emscripten b/recipes/emscripten/emscripten
index 79731138..90851bec 100644
--- a/recipes/emscripten/emscripten
+++ b/recipes/emscripten/emscripten
@@ -46,12 +46,14 @@ o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENE
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile .
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
-reicast libretro-reicast https://github.com/libretro/reicast-emulator.git master NO GENERIC Makefile .
+flycast libretro-flycast https://github.com/libretro/flycast.git master NO GENERIC Makefile .
 snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC Makefile .
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
diff --git a/recipes/linux/cores-linux-arm7neonhf b/recipes/linux/cores-linux-arm7neonhf
index d6caa763..8af4e378 100644
--- a/recipes/linux/cores-linux-arm7neonhf
+++ b/recipes/linux/cores-linux-arm7neonhf
@@ -20,7 +20,7 @@ dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YE
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC Makefile.libretro libretro target=arm
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -84,6 +84,7 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
@@ -94,6 +95,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
diff --git a/recipes/linux/cores-linux-armhf-generic b/recipes/linux/cores-linux-armhf-generic
index 2da82fe7..c4955c85 100644
--- a/recipes/linux/cores-linux-armhf-generic
+++ b/recipes/linux/cores-linux-armhf-generic
@@ -19,7 +19,7 @@ dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YE
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC Makefile.libretro libretro target=arm
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -81,6 +81,7 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
@@ -91,6 +92,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic
index 134eedd8..35f5e3b5 100644
--- a/recipes/linux/cores-linux-x64-generic
+++ b/recipes/linux/cores-linux-x64-generic
@@ -25,7 +25,7 @@ dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YE
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=x86_64
 dosbox_svn_glide libretro-dosbox_svn_glide https://github.com/fr500/dosbox-svn glide YES GENERIC Makefile.libretro libretro WITH_DYNAREC=x86_64
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro . USE_X64_DRC=1
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro USE_X64_DRC=1
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -76,7 +76,7 @@ mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makef
 mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
 mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem
 mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64
-mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git mupen_next YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64
+mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
 np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl2
@@ -93,10 +93,10 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
-redream libretro-redream https://github.com/libretro/redream.git master YES GENERIC Makefile deps/libretro
-reicast libretro-reicast https://github.com/libretro/reicast-emulator.git master YES GENERIC Makefile . HAVE_OIT=1
-reicast_wince libretro-reicast_wince https://github.com/libretro/reicast-emulator.git fh/wince YES GENERIC Makefile . HAVE_OIT=1
+flycast libretro-flycast https://github.com/libretro/flycast.git master YES GENERIC Makefile . HAVE_OIT=1
+flycast_wince libretro-flycast_wince https://github.com/libretro/flycast.git fh/wince YES GENERIC Makefile . HAVE_OIT=1
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
 sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC Makefile libretro
@@ -106,6 +106,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
@@ -126,3 +127,4 @@ virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-l
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git master YES GENERIC Makefile .
 yabasanshiro libretro-yabasanshiro https://github.com/libretro/yabause.git yabasanshiro YES GENERIC Makefile yabause/src/libretro
 yabause libretro-yabause https://github.com/libretro/yabause.git master YES GENERIC Makefile libretro
+test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
diff --git a/recipes/linux/cores-linux-x86-generic b/recipes/linux/cores-linux-x86-generic
index 827c1ad9..cc4e76bc 100644
--- a/recipes/linux/cores-linux-x86-generic
+++ b/recipes/linux/cores-linux-x86-generic
@@ -20,7 +20,7 @@ dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YE
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC Makefile.libretro libretro target=x86
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -70,7 +70,7 @@ mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makef
 mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
 mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem
 mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86
-mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git mupen_next YES GENERIC_GL Makefile . WITH_DYNAREC=x86
+mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_GL Makefile . WITH_DYNAREC=x86
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
 np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl2
@@ -87,8 +87,9 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
-reicast libretro-reicast https://github.com/libretro/reicast-emulator.git master YES GENERIC Makefile . HAVE_OIT=1
+flycast libretro-flycast https://github.com/libretro/flycast.git master YES GENERIC Makefile . HAVE_OIT=1
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
 sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC Makefile libretro
@@ -98,6 +99,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
diff --git a/recipes/nintendo/3ds b/recipes/nintendo/3ds
index e99c35fe..1b5b8768 100644
--- a/recipes/nintendo/3ds
+++ b/recipes/nintendo/3ds
@@ -1,18 +1,22 @@
 2048 libretro-2048 https://github.com/libretro/libretro-2048.git master YES GENERIC Makefile.libretro .
+81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC Makefile.libretro libretro WITH_DYNAREC=oldarm
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
 fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha2012_neogeo.git master YES GENERIC Makefile .
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/markwkidd/FreeIntv.git master YES GENERIC Makefile .
+fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
 gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makefile .
+gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
 handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .
 mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile .
@@ -26,21 +30,22 @@ mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Make
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
 np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl2
 nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC Makefile .
+o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC Makefile .
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro .
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
 pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master NO GENERIC Makefile .
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC Makefile .
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
-stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
+stella libretro-stella https://github.com/stella-emu/stella.git master NO GENERIC Makefile src/libretro
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master NO GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master NO GENERIC Makefile .
-gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
-81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
-fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
+vecx libretro-vecx https://github.com/libretro/libretro-vecx.git master YES GENERIC Makefile .
diff --git a/recipes/nintendo/gamecube b/recipes/nintendo/gamecube
index def17504..207fef65 100644
--- a/recipes/nintendo/gamecube
+++ b/recipes/nintendo/gamecube
@@ -25,6 +25,7 @@ snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
diff --git a/recipes/nintendo/libnx b/recipes/nintendo/libnx
index a3e75ce1..b91b17e1 100644
--- a/recipes/nintendo/libnx
+++ b/recipes/nintendo/libnx
@@ -5,7 +5,7 @@ cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES G
 crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn.git libretro YES GENERIC Makefile.libretro libretro
 desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
-dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master YES GENERIC Makefile .
+dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master NO GENERIC Makefile .
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
@@ -44,16 +44,18 @@ gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Ma
 81 libretro-81 https://github.com/libretro/81-libretro.git master YES GENERIC Makefile .
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 uzem libretro-uzem https://github.com/libretro/libretro-uzem.git master NO  GENERIC Makefile .
 fuse libretro-fuse https://github.com/libretro/fuse-libretro.git master YES GENERIC Makefile .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git master YES GENERIC Makefile.libretro .
diff --git a/recipes/nintendo/wii b/recipes/nintendo/wii
index 67ca762e..d0a9dec8 100644
--- a/recipes/nintendo/wii
+++ b/recipes/nintendo/wii
@@ -26,13 +26,16 @@ mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Make
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
 np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master NO GENERIC Makefile.libretro sdl2
 nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC Makefile .
+pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC Makefile .
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
diff --git a/recipes/nintendo/wiiu b/recipes/nintendo/wiiu
index c38b9f5d..ea31f2bf 100644
--- a/recipes/nintendo/wiiu
+++ b/recipes/nintendo/wiiu
@@ -4,8 +4,8 @@ hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC
 atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile .
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
-stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+stella libretro-stella https://github.com/stella-emu/stella.git master NO GENERIC Makefile src/libretro
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -42,6 +42,7 @@ nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git mas
 o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC Makefile .
 pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC Makefile libretro
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
@@ -51,6 +52,7 @@ snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
 mame2003_midway libretro-mame2003_midway https://github.com/libretro/mame2003_midway.git master YES GENERIC Makefile .
 scummvm libretro-scummvm https://github.com/libretro/scummvm.git master YES GENERIC Makefile backends/platform/libretro/build
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
diff --git a/recipes/playstation/ps3 b/recipes/playstation/ps3
index dc29fbfa..e1f5c388 100644
--- a/recipes/playstation/ps3
+++ b/recipes/playstation/ps3
@@ -5,8 +5,8 @@ cannonball libretro-cannonball https://github.com/libretro/cannonball.git master
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
 desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master NO GENERIC Makefile.libretro desmume
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
-dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro NO GENERIC Makefile.libretro libretro
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master NO GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master NO GENERIC makefile.libretro .
@@ -45,6 +45,7 @@ pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES G
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile .
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
 snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master NO GENERIC Makefile .
@@ -52,6 +53,7 @@ snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
diff --git a/recipes/playstation/psp b/recipes/playstation/psp
index dd84b4f5..d34fa82f 100644
--- a/recipes/playstation/psp
+++ b/recipes/playstation/psp
@@ -15,6 +15,7 @@ nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git mas
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 tempgba libretro-tempgba https://github.com/libretro/TempGBA-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master NO GENERIC Makefile .
 gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
diff --git a/recipes/playstation/vita b/recipes/playstation/vita
index 9d390ada..35932ec1 100644
--- a/recipes/playstation/vita
+++ b/recipes/playstation/vita
@@ -5,7 +5,7 @@ desmume libretro-desmume https://github.com/libretro/desmume.git master NO GENER
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YES GENERIC Makefile.libretro .
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn vita NO GENERIC Makefile.libretro libretro WITH_DYNAREC=arm
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -38,13 +38,15 @@ picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YE
 pokemini libretro-pokemini https://github.com/libretro/PokeMini.git master YES GENERIC Makefile .
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC_ALT Makefile .
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC Makefile .
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
-stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
+stella libretro-stella https://github.com/stella-emu/stella.git master NO GENERIC Makefile src/libretro
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master NO GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
diff --git a/recipes/windows/cores-windows-msvc2003-x86_dw2-generic b/recipes/windows/cores-windows-msvc2003-x86_dw2-generic
index ca86d7c3..d4d8a754 100644
--- a/recipes/windows/cores-windows-msvc2003-x86_dw2-generic
+++ b/recipes/windows/cores-windows-msvc2003-x86_dw2-generic
@@ -29,6 +29,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_ALT Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
diff --git a/recipes/windows/cores-windows-msvc2005-x86_dw2-generic b/recipes/windows/cores-windows-msvc2005-x86_dw2-generic
index b87e72e1..d42f4d5c 100644
--- a/recipes/windows/cores-windows-msvc2005-x86_dw2-generic
+++ b/recipes/windows/cores-windows-msvc2005-x86_dw2-generic
@@ -28,6 +28,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_ALT Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
diff --git a/recipes/windows/cores-windows-msvc2010-x64_seh-generic b/recipes/windows/cores-windows-msvc2010-x64_seh-generic
index df8bf205..3c0214e4 100644
--- a/recipes/windows/cores-windows-msvc2010-x64_seh-generic
+++ b/recipes/windows/cores-windows-msvc2010-x64_seh-generic
@@ -35,6 +35,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_ALT Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
diff --git a/recipes/windows/cores-windows-msvc2010-x86_dw2-generic b/recipes/windows/cores-windows-msvc2010-x86_dw2-generic
index 8e54ab2f..51d51529 100644
--- a/recipes/windows/cores-windows-msvc2010-x86_dw2-generic
+++ b/recipes/windows/cores-windows-msvc2010-x86_dw2-generic
@@ -35,6 +35,7 @@ snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master
 snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_ALT Makefile.libretro .
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
diff --git a/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic b/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic
index 5513abe0..7de9a378 100644
--- a/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic
+++ b/recipes/windows/cores-windows-msvc2017-desktop-x64_seh-generic
@@ -2,22 +2,25 @@
 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC Makefile .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
 desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/markwkidd/FreeIntv.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
 gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
-mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC Makefile .
+handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1
 mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1
+mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile .
+mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC Makefile .
 mednafen_pce libretro-beetle_pce https://github.com/libretro/beetle-pce-fast-libretro.git pce YES GENERIC Makefile .
 mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git master YES GENERIC Makefile .
 mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libretro.git master YES GENERIC Makefile .
 mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile .
 mednafen_psx_hw libretro-beetle_psx_hw https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile . HAVE_HW=1
 mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git master YES GENERIC Makefile .
+mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
diff --git a/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic b/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic
index c3bb9f3d..3d38e858 100644
--- a/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic
+++ b/recipes/windows/cores-windows-msvc2017-desktop-x86_dw2-generic
@@ -2,21 +2,24 @@
 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC Makefile .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
 desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/markwkidd/FreeIntv.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
 gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
+handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1
 mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1
+mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile .
 mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC Makefile .
 mednafen_pce libretro-beetle_pce https://github.com/libretro/beetle-pce-fast-libretro.git pce YES GENERIC Makefile .
 mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git master YES GENERIC Makefile .
 mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libretro.git master YES GENERIC Makefile .
 mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile .
 mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git master YES GENERIC Makefile .
+mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
diff --git a/recipes/windows/cores-windows-msvc2017-uwp-arm-generic b/recipes/windows/cores-windows-msvc2017-uwp-arm-generic
index 0a91e6e2..7de9a378 100644
--- a/recipes/windows/cores-windows-msvc2017-uwp-arm-generic
+++ b/recipes/windows/cores-windows-msvc2017-uwp-arm-generic
@@ -2,15 +2,17 @@
 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC Makefile .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
 desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/markwkidd/FreeIntv.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
 gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
+handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1
 mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1
+mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile .
 mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC Makefile .
 mednafen_pce libretro-beetle_pce https://github.com/libretro/beetle-pce-fast-libretro.git pce YES GENERIC Makefile .
 mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git master YES GENERIC Makefile .
@@ -18,6 +20,7 @@ mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libre
 mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile .
 mednafen_psx_hw libretro-beetle_psx_hw https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile . HAVE_HW=1
 mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git master YES GENERIC Makefile .
+mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
diff --git a/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic b/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic
index fe5937dd..b44788cd 100644
--- a/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic
+++ b/recipes/windows/cores-windows-msvc2017-uwp-x64_seh-generic
@@ -2,21 +2,24 @@
 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC Makefile .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
 desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/markwkidd/FreeIntv.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
 gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
+handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1
 mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1
+mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile .
 mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC Makefile .
 mednafen_pce libretro-beetle_pce https://github.com/libretro/beetle-pce-fast-libretro.git pce YES GENERIC Makefile .
 mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git master YES GENERIC Makefile .
 mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libretro.git master YES GENERIC Makefile .
 mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile .
 mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git master YES GENERIC Makefile .
+mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
diff --git a/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic b/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic
index 0a91e6e2..7de9a378 100644
--- a/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic
+++ b/recipes/windows/cores-windows-msvc2017-uwp-x86_dw2-generic
@@ -2,15 +2,17 @@
 4do libretro-4do https://github.com/libretro/4do-libretro.git master YES GENERIC Makefile .
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
 desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fceumm libretro-fceumm https://github.com/libretro/libretro-fceumm.git master YES GENERIC Makefile.libretro .
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/markwkidd/FreeIntv.git master YES GENERIC Makefile .
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git master YES GENERIC Makefile .
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
 gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
+handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
 mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1
 mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile . CCACHE_DISABLE=1
+mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git master YES GENERIC Makefile .
 mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git master YES GENERIC Makefile .
 mednafen_pce libretro-beetle_pce https://github.com/libretro/beetle-pce-fast-libretro.git pce YES GENERIC Makefile .
 mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git master YES GENERIC Makefile .
@@ -18,6 +20,7 @@ mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libre
 mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile .
 mednafen_psx_hw libretro-beetle_psx_hw https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile . HAVE_HW=1
 mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git master YES GENERIC Makefile .
+mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
 mesen libretro-mesen https://github.com/SourMesen/Mesen.git master YES GENERIC Makefile Libretro platform=windows_msvc2017_desktop_x64
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic
index bd114f43..7a95342f 100644
--- a/recipes/windows/cores-windows-x64_seh-generic
+++ b/recipes/windows/cores-windows-x64_seh-generic
@@ -23,7 +23,7 @@ dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YE
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
 dosbox_svn_glide libretro-dosbox_svn_glide https://github.com/fr500/dosbox-svn glide YES GENERIC Makefile.libretro libretro
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro . USE_X64_DRC=1
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro USE_X64_DRC=1
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -74,7 +74,7 @@ mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makef
 mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
 mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem
 mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64
-mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git mupen_next YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64
+mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
 np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl2
@@ -90,10 +90,10 @@ ppsspp libretro-ppsspp https://github.com/hrydgard/ppsspp.git master YES GENERIC
 prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YES GENERIC Makefile .
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
-redream libretro-redream https://github.com/libretro/redream.git master YES GENERIC Makefile deps/libretro
-reicast libretro-reicast https://github.com/libretro/reicast-emulator.git master YES GENERIC Makefile . HAVE_OIT=1
-reicast_wince libretro-reicast_wince https://github.com/libretro/reicast-emulator.git fh/wince YES GENERIC Makefile . HAVE_OIT=1
+flycast libretro-flycast https://github.com/libretro/flycast.git master YES GENERIC Makefile . HAVE_OIT=1
+flycast_wince libretro-flycast_wince https://github.com/libretro/flycast.git fh/wince YES GENERIC Makefile . HAVE_OIT=1
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
 sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC Makefile libretro
@@ -105,6 +105,7 @@ snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
@@ -121,3 +122,4 @@ virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-l
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git master YES GENERIC Makefile .
 yabasanshiro libretro-yabasanshiro https://github.com/libretro/yabause.git yabasanshiro YES GENERIC Makefile yabause/src/libretro
 yabause libretro-yabause https://github.com/libretro/yabause.git master YES GENERIC Makefile libretro
+test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic
index a7a764ff..e663fbb2 100644
--- a/recipes/windows/cores-windows-x86_dw2-generic
+++ b/recipes/windows/cores-windows-x86_dw2-generic
@@ -22,7 +22,7 @@ dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master YE
 dosbox_svn libretro-dosbox_svn https://github.com/fr500/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
 dosbox_svn_glide libretro-dosbox_svn_glide https://github.com/fr500/dosbox-svn glide YES GENERIC Makefile.libretro libretro
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git master YES GENERIC Makefile.libretro builds/libretro
-fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master YES GENERIC makefile.libretro .
+fbneo libretro-fbneo https://github.com/libretro/FBNeo.git master YES GENERIC Makefile src/burner/libretro
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master YES GENERIC makefile.libretro svn-current/trunk
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master YES GENERIC makefile.libretro .
 fbalpha2012_cps2 libretro-fbalpha2012_cps2 https://github.com/libretro/fbalpha2012_cps2.git master YES GENERIC makefile.libretro .
@@ -72,6 +72,7 @@ mgba libretro-mgba https://github.com/libretro/mgba.git master YES GENERIC Makef
 mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC Makefile .
 mu libretro-mu https://github.com/meepingsnesroms/Mu.git master YES GENERIC Makefile libretroBuildSystem
 mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86
+mupen64plus_next libretro-mupen64plus_next https://github.com/libretro/mupen64plus-libretro-nx.git GLideN64 YES GENERIC_GL Makefile . WITH_DYNAREC=x86
 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC Makefile.libretro libretro
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
 np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC Makefile.libretro sdl2
@@ -88,8 +89,9 @@ prboom libretro-prboom https://github.com/libretro/libretro-prboom.git master YE
 prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git master YES GENERIC Makefile .
 puae libretro-uae https://github.com/libretro/libretro-uae.git master YES GENERIC Makefile .
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
+quasi88 libretro-quasi88 https://github.com/libretro/quasi88-libretro.git master YES GENERIC Makefile .
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
-reicast libretro-reicast https://github.com/libretro/reicast-emulator.git master YES GENERIC Makefile . HAVE_OIT=1
+flycast libretro-flycast https://github.com/libretro/flycast.git master YES GENERIC Makefile . HAVE_OIT=1
 reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC Makefile .
 remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git master YES GENERIC Makefile .
 sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC Makefile libretro
@@ -101,6 +103,7 @@ snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC Makefile.libretro .
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 stella libretro-stella https://github.com/stella-emu/stella.git master YES GENERIC Makefile src/libretro
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
 thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -DCMAKE_BUILD_TYPE="Release"
@@ -117,3 +120,4 @@ virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-l
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git master YES GENERIC Makefile .
 yabasanshiro libretro-yabasanshiro https://github.com/libretro/yabause.git yabasanshiro YES GENERIC Makefile yabause/src/libretro
 yabause libretro-yabause https://github.com/libretro/yabause.git master YES GENERIC Makefile libretro
+test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
diff --git a/recipes/xbox/cores-xbox-msvc2003-x86_dw2-generic b/recipes/xbox/cores-xbox-msvc2003-x86_dw2-generic
index c20b40a0..c74f58bc 100644
--- a/recipes/xbox/cores-xbox-msvc2003-x86_dw2-generic
+++ b/recipes/xbox/cores-xbox-msvc2003-x86_dw2-generic
@@ -27,6 +27,7 @@ pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.git
 quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC Makefile .
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git master YES GENERIC_ALT Makefile.libretro .
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC Makefile libretro
+squirreljme libretro-squirreljme https://github.com/XerTheSquirrel/SquirrelJME.git trunk YES GENERIC makefilelibretro ratufacoat
 stella2014 libretro-stella2014 https://github.com/libretro/stella2014-libretro.git master YES GENERIC Makefile .
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master YES GENERIC Makefile .
 theodore libretro-theodore https://github.com/Zlika/theodore.git master YES GENERIC Makefile .
diff --git a/retroarch-release.sh b/retroarch-release.sh
index 7d21b08e..2bea23ce 100755
--- a/retroarch-release.sh
+++ b/retroarch-release.sh
@@ -1,44 +1,25 @@
 #!/bin/sh
-# vim: set ts=3 sw=3 noet ft=sh : bash
-# RetroArch packaging script
+# vim: set ts=3 sw=3 noet ft=sh : sh
+# RetroArch packaging script for release tarballs
 
 PRGNAM=RetroArch
 SRCNAM="$(printf %s $PRGNAM | tr '[:upper:]' '[:lower:]')"
 TMP=${TMP:-/tmp/libretro}
-FORCE=0
-CLEAN=0
-
-for x in $@; do
-	if [ "$x" == "--force" ]; then
-        FORCE=1
-	fi
-	if [ "$x" == "--clean" ]; then
-        CLEAN=1
-	fi
-done
 
 # Exit on errors and unset variables
 set -eu
 
 # Ensure a clean and fully updated repo
 if [ -d $SRCNAM ]; then
-    if [ $CLEAN -gt 0 ]; then
-		rm -rf -- $SRCNAM
-	elif [ $FORCE -gt 0 ]; then
-		echo "Using existing state of $SRCNAM. If build fails, use --clean to delete and re-clone."
-	else
-		echo "FATAL: $SRCNAM/ exists."
-		echo ""
-		echo " - To build with existing sources: $0 --force"
-		echo " - To delete existing sources and re-clone: $0 --clean"
-		echo ""
-		echo "WARNING: The --clean option does not preserve forks. That is,"
-		echo "the original libretro/$PRGNAM repository will be cloned, not"
-		echo "your personal fork. To build a release build from a fork,"
-		echo "use --force."
-		exit 1
-	fi
+	printf %s\\n "WARNING: The $PRGNAM directory already exists." \
+		"Remove the $PRGNAM directory and continue? (y/n)" >&2
+	read -r answer
+	case "$answer" in
+		[yY]|[yY][eE][sS] ) rm -rf -- $SRCNAM ;;
+		* ) printf %s\\n 'Exiting ...'; exit 0 ;;
+	esac
 fi
+
 ./libretro-fetch.sh $SRCNAM
 
 COMMIT="$(git --work-tree=$SRCNAM --git-dir=$SRCNAM/.git describe --abbrev=0 \
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index d994a43a..cab08d8e 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -164,12 +164,12 @@ libretro_snes9x_name="SNES9x"
 libretro_snes9x_git_url="https://github.com/libretro/snes9x.git"
 libretro_snes9x_build_subdir="libretro"
 
-include_core_reicast() {
-	register_module core "reicast"
+include_core_flycast() {
+	register_module core "flycast"
 }
-libretro_reicast_name="Reicast"
-libretro_reicast_git_url="https://github.com/libretro/reicast-emulator.git"
-libretro_reicast_build_makefile="Makefile"
+libretro_flycast_name="Flycast"
+libretro_flycast_git_url="https://github.com/libretro/flycast.git"
+libretro_flycast_build_makefile="Makefile"
 
 include_core_redream() {
 	register_module core "redream"
@@ -221,12 +221,12 @@ libretro_video_processor_name="Video processor"
 libretro_video_processor_git_url="https://github.com/libretro/libretro-video-processor.git"
 libretro_video_processor_build_makefile="Makefile"
 
-include_core_fbalpha() {
-	register_module core "fbalpha" -psp1
+include_core_fbneo() {
+	register_module core "fbneo" -psp1
 }
-libretro_fbalpha_name="Final Burn Alpha"
-libretro_fbalpha_git_url="https://github.com/libretro/fbalpha.git"
-libretro_fbalpha_build_makefile="makefile.libretro"
+libretro_fbneo_name="FinalBurn Neo"
+libretro_fbneo_git_url="https://github.com/libretro/FBNeo.git"
+libretro_fbneo_build_subdir="src/burner/libretro"
 
 include_core_fbalpha2012() {
 	register_module core "fbalpha2012" -psp1
@@ -604,6 +604,13 @@ libretro_dosbox_name="DOSBox"
 libretro_dosbox_git_url="https://github.com/libretro/dosbox-libretro.git"
 libretro_dosbox_makefile="Makefile.libretro"
 
+include_core_dosbox_svn() {
+	register_module core "dosbox_svn" -ngc -ps3 -psp1 -wii
+}
+libretro_dosbox_svn_name="DOSBox"
+libretro_dosbox_svn_git_url="https://github.com/libretro/dosbox-svn.git"
+libretro_dosbox_svn_makefile="Makefile.libretro"
+
 include_core_basilisk2() {
 	register_module core "basilisk2" -ngc -ps3 -psp1 -wii
 }
@@ -764,7 +771,7 @@ include_core_mupen64plus_next() {
 	register_module core "mupen64plus_next" -theos_ios -ngc -ps3 -psp1 -wii
 }
 libretro_mupen64plus_next_name="Mupen64 Plus Next"
-libretro_mupen64plus_next_git_url="https://github.com/libretro/mupen64plus-libretro.git"
+libretro_mupen64plus_next_git_url="https://github.com/libretro/mupen64plus-libretro-nx.git"
 libretro_mupen64plus_next_build_platform="$FORMAT_COMPILER_TARGET_ALT"
 libretro_mupen64plus_next_configure() {
 	if iscpu_x86_64 $ARCH; then
@@ -913,6 +920,13 @@ libretro_stonesoup_git_submodules="clone"
 libretro_stonesoup_build_subdir="crawl-ref"
 libretro_stonesoup_build_makefile="Makefile.libretro"
 
+include_core_freechaf() {
+	register_module core "freechaf" -ngc -ps3 -psp1 -qnx -wii
+}
+libretro_freechaf_name="FreeChaF"
+libretro_freechaf_git_url="https://github.com/libretro/FreeChaF.git"
+libretro_freechaf_build_makefile="Makefile"
+
 include_core_hatari() {
 	register_module core "hatari" -theos_ios -ngc -ps3 -psp1 -qnx -wii
 }
@@ -1047,6 +1061,21 @@ libretro_tic80_git_submodules="yes"
 libretro_tic80_build_makefile="Makefile"
 libretro_tic80_build_subdir="examples/libretro"
 
+include_core_squirreljme() {
+	register_module core "squirreljme"
+}
+libretro_squirreljme_name="SquirrelJME"
+libretro_squirreljme_git_url="https://github.com/XerTheSquirrel/SquirrelJME.git"
+libretro_squirreljme_build_makefile="makefilelibretro"
+libretro_squirreljme_build_subdir="ratufacoat"
+
+include_core_quasi88() {
+	register_module core "quasi88" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii
+}
+libretro_quasi88_name="QUASI88"
+libretro_quasi88_git_url="https://github.com/libretro/quasi88-libretro.git"
+libretro_quasi88_build_makefile="Makefile"
+
 # CORE RULE VARIABLES
 #
 # All variables follow the format of libretro_<core>_<setting> where <core> is