diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index fbf52b1d..5a962d2a 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -9,7 +9,7 @@
 
 ####environment configuration:
 echo "BUILDBOT JOB: Setting up Environment for $1"
-echo 
+echo
 
 ORIGPATH=$PATH
 WORK=$PWD
@@ -192,9 +192,9 @@ build_libretro_generic_makefile() {
 
 	cd $DIR
 	cd $SUBDIR
+	OLDJ=$JOBS
 
 	if [ "${NAME}" = "mame078" ]; then
-		OLDJ=$JOBS
 		JOBS=1
 	fi
 
@@ -227,6 +227,11 @@ build_libretro_generic_makefile() {
 
 	if [ $? -eq 0 ]; then 
 		MESSAGE="$1 build successful ($jobid)"
+		if [ "${MAKEPORTABLE}" == "YES" ];
+                then
+		    echo "$1 running retrolink ($jobid)"
+		    $WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
+                fi
 		cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}.${FORMAT_EXT}
 	else
 		MESSAGE="$1 build failed ($jobid)"
@@ -614,7 +619,7 @@ while read line; do
 
 			else
 				echo "cloning repo..."
-				git clone "$URL" "$DIR" --depth=1
+				git clone "$URL" "$DIR"
 				cd $DIR
 				git checkout $TYPE
 				cd ..
@@ -1266,22 +1271,21 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
 		echo "BUILDBOT JOB: $jobid Building"
 		echo 
 
-		if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
+		if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
 
-			cd dist-scripts
-			rm *.a
-			cp -v $RARCH_DIST_DIR/* .
-			sh ./psp1-cores.sh
-			if [ $? -eq 0 ]; then
-				MESSAGE="retroarch build successful ($jobid)"
-				echo $MESSAGE
-			else
-				MESSAGE="retroarch build failed ($jobid)"
-				echo $MESSAGE
-			fi
-			buildbot_log "$MESSAGE"
-			cd ..
+		cd dist-scripts
+		rm *.a
+		cp -v $RARCH_DIST_DIR/*.a .
+		ls -1 *.a  | awk -F "." ' { print "cp " $0 " " $1 "_psp1." $2 }' |sh
 
+
+		./psp1-cores.sh
+		if [ $? -eq 0 ]; then
+			MESSAGE="retroarch build successful ($jobid)"
+			echo $MESSAGE
+		else
+			MESSAGE="retroarch build failed ($jobid)"
+			echo $MESSAGE
 		fi
 
 		echo "Packaging"
@@ -1304,6 +1308,157 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
 
 fi
 
+if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ];
+then
 
+	while read line; do
+
+		NAME=`echo $line | cut --fields=1 --delimiter=" "`
+		DIR=`echo $line | cut --fields=2 --delimiter=" "`
+		URL=`echo $line | cut --fields=3 --delimiter=" "`
+		TYPE=`echo $line | cut --fields=4 --delimiter=" "`
+		ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
+		PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
+
+		if [ "${ENABLED}" == "YES" ];
+		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
+
+			ARGS=""
+
+			TEMP=`echo $line | cut --fields=9 --delimiter=" "`
+			if [ -n ${TEMP} ];
+			then
+				ARGS="${TEMP}"
+		fi
+		TEMP=""
+		TEMP=`echo $line | cut --fields=10 --delimiter=" "`
+		if [ -n ${TEMP} ];
+		then
+			ARGS="${ARGS} ${TEMP}"
+		fi
+		TEMP=""
+		TEMP=`echo $line | cut --fields=11 --delimiter=" "`
+		if [ -n ${TEMP} ];
+		then
+			ARGS="${ARGS} ${TEMP}"
+		fi
+		TEMP=""
+		TEMP=`echo $line | cut --fields=12 --delimiter=" "`
+		if [ -n ${TEMP} ];
+		then
+			ARGS="${ARGS} ${TEMP}"
+		fi
+		TEMP=""
+		TEMP=`echo $line | cut --fields=13 --delimiter=" "`
+		if [ -n ${TEMP} ];
+		then
+			ARGS="${ARGS} ${TEMP}"
+		fi
+		TEMP=""
+		TEMP=`echo $line | cut --fields=14 --delimiter=" "`
+		if [ -n ${TEMP} ];
+		then
+			ARGS="${ARGS} ${TEMP}"
+		fi
+
+		ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
+
+		echo ARGS: $ARGS
+
+		if [ -d "${PARENTDIR}/${DIR}/.git" ];
+		then
+		cd $PARENTDIR
+			cd $DIR
+			echo "pulling from repo... "
+			OUT=`git pull`
+			echo $OUT
+			if [ "${TYPE}" == "PROJECT" ];
+			then
+				RADIR=$DIR
+				if [[ $OUT == *"Already up-to-date"* ]]
+				then
+					BUILD="NO"
+				else	
+					BUILD="YES"
+				fi
+			fi
+			cd $WORK
+		else
+			echo "cloning repo..."
+			cd $PARENTDIR
+			git clone "$URL" "$DIR" --depth=1
+			cd $DIR
+	
+			if [ "${TYPE}" == "PROJECT" ];
+			then
+				BUILD="YES"
+				RADIR=$DIR
+
+			fi
+			cd $WORK
+		fi
+	fi
+
+	echo
+	echo
+	done  < $1.ra
+	if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
+	then
+
+		cd $RADIR
+	        #rm -rfv wii/pkg
+		echo "BUILDBOT JOB: $jobid Building"
+		echo
+
+	if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
+	then
+
+		cd dist-scripts
+		rm *.a
+		cp -v $RARCH_DIST_DIR/*.a .
+
+		ls -1 *.a  | awk -F "." ' { print "cp " $0 " " $1 "_wii." $2 }' |sh
+		sh ./wii-cores.sh
+        if [ $? -eq 0 ];
+        then
+            MESSAGE="retroarch build successful ($jobid)"
+            echo $MESSAGE
+	    else
+            MESSAGE="retroarch build failed ($jobid)"
+            echo $MESSAGE
+		fi
+        buildbot_log "$MESSAGE"
+        cd ..
+
+	fi
+
+			echo "Packaging"
+			echo ============================================
+			cp retroarch.cfg retroarch.default.cfg
+
+			mkdir -p wii/pkg/
+			mkdir -p wii/pkg/overlays
+			mkdir -p wii/pkg/cheats
+			mkdir -p wii/pkg/database
+			mkdir -p wii/pkg/database/cursors
+			mkdir -p wii/pkg/database/rdb
+
+			cp -Rfv media/libretrodb/cht/* wii/pkg/cheats
+			cp -Rfv media/libretrodb/rdb/* wii/pkg/database/rdb
+			cp -Rfv media/libretrodb/cursors/* wii/pkg/database/cursors
+			cp -Rfv media/overlays/* wii/pkg/overlays
+
+
+	fi
+
+fi
 
 PATH=$ORIGPATH
diff --git a/libretro-config.sh b/libretro-config.sh
index 80dfa853..b2ee448a 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -71,7 +71,7 @@ case "$platform" in
 					X86=true
 					;;
 				armv*)
-					ARM=true
+B					ARM=true
 					export FORMAT_COMPILER_TARGET=armv
 					export RARCHCFLAGS="$RARCHCFLAGS -marm"
 					case "${ARCH}" in
@@ -117,6 +117,11 @@ case "$platform" in
 					FORMAT_COMPILER_TARGET="psp1"
 					DIST_DIR="psp1"
 					;;
+				*wii*)
+					FORMAT_EXT="a"
+					FORMAT_COMPILER_TARGET="wii"
+					DIST_DIR="wii"
+					;;
 				theos_ios*)
 					FORMAT_EXT="dylib"
 					FORMAT_COMPILER_TARGET="theos_ios"
diff --git a/recipes/linux-portable/portable b/recipes/linux-portable/portable
index 2231dacc..27c3cbc3 100644
--- a/recipes/linux-portable/portable
+++ b/recipes/linux-portable/portable
@@ -1,2 +1,51 @@
-prboom libretro-prboom  https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC Makefile . 
+2048 libretro-2048  https://github.com/libretro/libretro-2048.git PROJECT YES GENERIC Makefile.libretro . 
+4do libretro-4do https://github.com/libretro/4do-libretro.git PROJECT YES GENERIC Makefile . 
+beetle_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT NO GENERIC Makefile . 
+bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git PROJECT YES GENERIC Makefile.libretro . 
+bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-libretro-cplusplus98.git PROJECT YES BSNES Makefile . cpp98 
+catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC Makefile . 
+desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC Makefile.libretro desmume 
+dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC Makefile . 
+fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk 
+fba_cores_cps1 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps1 
+fba_cores_cps2 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps2 
+fba_cores_neo libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/neogeo 
+fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
+fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile . 
+gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile.libretro libgambatte 
+genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . 
+gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC Makefile . 
+handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC Makefile . 
+hatari libretro-hatari https://github.com/libretro/libretro-hatari.git PROJECT YES GENERIC Makefile.libretro . 
+mednafen_gba libretro-mednafen_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_psx libretro-mednafen_psx https://github.com/libretro/mednafen-psx-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_wswan libretro-mednafen_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT YES GENERIC Makefile . 
+meteor libretro-meteor  https://github.com/libretro/meteor-libretro.git PROJECT YES GENERIC Makefile libretro 
+nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT YES GENERIC Makefile libretro 
+nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC Makefile . 
+o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT YES GENERIC Makefile . 
+pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT YES GENERIC Makefile.libretro . USE_DYNAREC=0 
+picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE YES GENERIC Makefile.libretro . 
+prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT YES GENERIC Makefile . 
+puae libretro-uae https://github.com/libretro/libretro-uae.git PROJECT YES GENERIC Makefile build 
+quicknes libretro-quicknes  https://github.com/libretro/QuickNES_Core.git PROJECT YES GENERIC Makefile libretro 
+remotejoy libretro-remotejoy  https://github.com/libretro/libretro-remotejoy.git PROJECT YES GENERIC Makefile . 
+scummvm libretro-scummvm  https://github.com/libretro/scummvm.git PROJECT YES GENERIC Makefile backends/platform/libretro/build 
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC Makefile libretro 
+snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_ALT Makefile.libretro . 
+stella libretro-stella  https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC Makefile . 
+tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC Makefile . 
+tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile . 
+vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC Makefile.libretro . 
+vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC Makefile src/libretro 
+vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . 
+virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile . 
+yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro 
+
diff --git a/recipes/linux-portable/portable.conf b/recipes/linux-portable/portable.conf
index 846ba27f..ca41d7d9 100644
--- a/recipes/linux-portable/portable.conf
+++ b/recipes/linux-portable/portable.conf
@@ -1,2 +1,2 @@
-platform linux-portable
-
+platform unix
+MAKEPORTABLE YES
diff --git a/recipes/psp/devkitpsp b/recipes/psp/devkitpsp
index 6fd53c1e..f0dffb88 100644
--- a/recipes/psp/devkitpsp
+++ b/recipes/psp/devkitpsp
@@ -1,7 +1,7 @@
-gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC_ALT Makefile.libretro libgambatte
-fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro .
-nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC Makefile .
-fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile .
-prboom libretro-prboom  https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC Makefile .
-tempgba libretro-tempgba https://github.com/libretro/TempGBA-libretro.git PROJECT YES GENERIC Makefile .
-mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/aliaspider/beetle-pce-fast-libretro.git psp_hw_render YES GENERIC Makefile .
+gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile.libretro libgambatte 
+fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
+nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC Makefile . 
+fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile . 
+prboom libretro-prboom  https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC Makefile . 
+tempgba libretro-tempgba https://github.com/libretro/TempGBA-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/aliaspider/beetle-pce-fast-libretro.git psp_hw_render YES GENERIC Makefile . 
diff --git a/recipes/psp/devkitpsp.conf b/recipes/psp/devkitpsp.conf
index fdae08cf..5a410b0a 100644
--- a/recipes/psp/devkitpsp.conf
+++ b/recipes/psp/devkitpsp.conf
@@ -3,6 +3,6 @@ platform psp1
 PLATFORM psp1
 CC psp-gcc
 CXX psp-g++
-MAKE /mingw64/bin/mingw32-make.exe
+MAKE /usr/bin/make
 SUFFIX _psp1
 RA YES
diff --git a/recipes/psp/devkitpsp.ra b/recipes/psp/devkitpsp.ra
index 944b2400..c390d6da 100644
--- a/recipes/psp/devkitpsp.ra
+++ b/recipes/psp/devkitpsp.ra
@@ -1,3 +1,2 @@
 retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES .
-overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media 
 libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch/media 
diff --git a/recipes/recipes-android b/recipes/recipes-android
index 8b1b3618..3f2bf543 100644
--- a/recipes/recipes-android
+++ b/recipes/recipes-android
@@ -35,7 +35,7 @@ snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERI
 snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni 
 stella libretro-stella https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
-tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni 
+tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni 
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_JNI Makefile src/libretro/jni 
 vecx libretro-vecx https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni 
diff --git a/recipes/wii/devkitwii b/recipes/wii/devkitwii
index 76689c1a..d2e6670b 100644
--- a/recipes/wii/devkitwii
+++ b/recipes/wii/devkitwii
@@ -1,4 +1,21 @@
-gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC_ALT Makefile.libretro libgambatte
-fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro .
-nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC Makefile .
-
+fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk 
+fba_cores_cps1 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps1 
+fba_cores_cps2 libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/cps2 
+fba_cores_neo libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC makefile.libretro svn-current/trunk/fbacores/neogeo 
+fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
+gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC_ALT Makefile.libretro libgambatte 
+genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . 
+mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_wswan libretro-mednafen_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT YES GENERIC Makefile . 
+nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT YES GENERIC Makefile libretro 
+nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC Makefile . 
+prboom libretro-prboom  https://github.com/libretro/libretro-prboom.git PROJECT YES GENERIC_ALT Makefile . 
+quicknes libretro-quicknes  https://github.com/libretro/QuickNES_Core.git PROJECT YES GENERIC Makefile libretro 
+snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC Makefile libretro 
+snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_ALT Makefile.libretro . 
+tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile . 
+vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC Makefile.libretro . 
diff --git a/recipes/wii/devkitwii.conf b/recipes/wii/devkitwii.conf
index 9c91677e..69a1ce70 100644
--- a/recipes/wii/devkitwii.conf
+++ b/recipes/wii/devkitwii.conf
@@ -1,9 +1,10 @@
-PATH /c/Toolchains/devkitPro/devkitPPC/bin/
+PATH /opt/devkitPro/devkitPPC/bin
 platform wii
 PLATFORM wii
 CC powerpc-eabi-gcc
 CXX powerpc-eabi-g++
 AR powerpc--eabi-ar
-MAKE /mingw64/bin/mingw32-make.exe
 SUFFIX _wii
+DEVKITPRO /opt/devkitPro
+DEVKITPPC /opt/devkitPro/devkitPPC
 RA YES
diff --git a/recipes/win_x64/cores-mingw-w64-seh b/recipes/win_x64/cores-mingw-w64-seh
index 1a5e7fd7..3ca4655e 100644
--- a/recipes/win_x64/cores-mingw-w64-seh
+++ b/recipes/win_x64/cores-mingw-w64-seh
@@ -52,7 +52,7 @@ snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERI
 snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_ALT Makefile.libretro .
 stella libretro-stella  https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC Makefile .
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC Makefile .
-tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile.libretro .
+tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile . 
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC_ALT Makefile.libretro .
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_ALT Makefile src/libretro
 vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro .
diff --git a/recipes/win_x86/cores-mingw-w32-dw2 b/recipes/win_x86/cores-mingw-w32-dw2
index 62203f99..54665576 100644
--- a/recipes/win_x86/cores-mingw-w32-dw2
+++ b/recipes/win_x86/cores-mingw-w32-dw2
@@ -41,7 +41,7 @@ snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERI
 snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_ALT Makefile.libretro .
 stella libretro-stella  https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC Makefile .
 tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC Makefile .
-tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile.libretro .
+tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC Makefile .
 vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC_ALT Makefile.libretro .
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_ALT Makefile src/libretro
 vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro .
diff --git a/retrolink.sh b/retrolink.sh
old mode 100644
new mode 100755