diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index e98e76ba..7c67c4e0 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -727,109 +727,6 @@ echo
 cd $WORK
 BUILD=""
 
-if [ "${PLATFORM}" == "psp1" ];
-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=" "`
-		SUBDIR=`echo $line | cut --fields=8 --delimiter=" "`
-
-		if [ "${ENABLED}" == "YES" ];
-		then
-			echo "BUILDBOT JOB: $jobid Processing $NAME"
-			echo 
-			echo NAME: $NAME
-			echo DIR: $DIR
-			echo SUBDIR: $SUBDIR
-			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 "${DIR}/.git" ];
-			then
-
-				cd $DIR
-				echo "pulling from repo... "
-				OUT=`git pull`
-				echo $OUT
-				if [[ $OUT == *"Already up-to-date"* ]]
-				then
-					BUILD="NO"
-				else
-					BUILD="YES"
-				fi
-				cd ..
-
-			else
-				echo "cloning repo..."
-				git clone "$URL" "$DIR" --depth=1
-				cd $DIR
-				BUILD="YES"
-				cd ..
-			fi
-		fi
-
-		if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
-		then
-			cd $DIR
-			rm -rfv psp1/pkg/
-			cd dist-scripts
-			rm *.a
-			cp -v $RARCH_DIST_DIR/* .
-			sh ./psp1-cores.sh
-		fi
-
-	done  < $1.ra
-
-fi
-
 if [ "${PLATFORM}" == "android" ] && [ "${RA}" == "YES" ];
 then
 
@@ -1359,5 +1256,190 @@ EOF
 
 fi
 
+if [ "${PLATFORM}" == "psp1" ] && [ "${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 psp1/pkg
+		echo "BUILDBOT JOB: $jobid Building"
+		echo 
+
+	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 ..      
+
+	fi            
+			
+			echo "Packaging"
+			echo ============================================
+			cp retroarch.cfg retroarch.default.cfg
+cat << EOF > retroarch.cfg
+assets_directory = ":\assets"
+audio_filter_dir = ":\filters\audio"
+cheat_database_path = ":\cheats"
+config_save_on_exit = "true"
+content_database_directory = ":\database\rdb"
+cursor_directory = ":\database\cursors"
+input_joypad_driver = "winxinput"
+input_osk_overlay_enable = "false"
+input_remapping_directory = ":\config"
+joypad_autoconfig_dir = ":\autoconfig"
+libretro_directory = ":\cores"
+load_dummy_on_core_shutdown = "false"
+menu_collapse_subgroups_enable = "true"
+osk_overlay_directory = ":\overlays"
+overlay_directory = ":\overlays"
+playlist_directory = ":\playlists"
+rgui_browser_directory = ":\content"
+rgui_config_directory = ":\config"
+savefile_directory = ":\saves"
+savestate_directory = ":\states"
+screenshot_directory = ":\screenshots"
+system_directory = ":\system"
+video_driver = "gl"
+video_filter_dir = ":\filters\video"
+video_shader_dir = ":\shaders"
+
+EOF
+
+			
+			
+			mkdir -p psp1/pkg/
+			mkdir -p psp1/pkg/overlays
+			mkdir -p psp1/pkg/cheats
+			mkdir -p psp1/pkg/database
+			mkdir -p psp1/pkg/database/cursors
+			mkdir -p psp1/pkg/database/rdb
+			
+			cp -v *.cfg psp1/pkg/
+			cp -Rfv media/overlays/* psp1/pkg/overlays
+			cp -Rfv media/libretrodb/cht/* psp1/pkg/cheats
+			cp -Rfv media/libretrodb/rdb/* psp1/pkg/database/rdb
+			cp -Rfv media/libretrodb/cursors/* psp1/pkg/database/cursors
+
+												
+
+
+	fi
+
+fi
+
+
 
 PATH=$ORIGPATH
diff --git a/recipes/psp/devkitpsp b/recipes/psp/devkitpsp
new file mode 100644
index 00000000..6fd53c1e
--- /dev/null
+++ b/recipes/psp/devkitpsp
@@ -0,0 +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 .
diff --git a/recipes/psp/devkitpsp.conf b/recipes/psp/devkitpsp.conf
new file mode 100644
index 00000000..fdae08cf
--- /dev/null
+++ b/recipes/psp/devkitpsp.conf
@@ -0,0 +1,8 @@
+PATH /c/Toolchains/devkitPro/devkitPSP/bin/
+platform psp1
+PLATFORM psp1
+CC psp-gcc
+CXX psp-g++
+MAKE /mingw64/bin/mingw32-make.exe
+SUFFIX _psp1
+RA YES
diff --git a/recipes/psp/devkitpsp.ra b/recipes/psp/devkitpsp.ra
new file mode 100644
index 00000000..944b2400
--- /dev/null
+++ b/recipes/psp/devkitpsp.ra
@@ -0,0 +1,3 @@
+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.pspsdk.conf b/recipes/recipes.pspsdk.conf
index 32d65319..76ca3657 100644
--- a/recipes/recipes.pspsdk.conf
+++ b/recipes/recipes.pspsdk.conf
@@ -3,3 +3,4 @@ platform psp1
 CC psp-gcc
 CXX psp-g++
 MAKE /mingw64/bin/mingw32-make.exe
+SUFFIX _psp1
diff --git a/recipes/wii/devkitwii b/recipes/wii/devkitwii
new file mode 100644
index 00000000..76689c1a
--- /dev/null
+++ b/recipes/wii/devkitwii
@@ -0,0 +1,4 @@
+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 .
+
diff --git a/recipes/wii/devkitwii.conf b/recipes/wii/devkitwii.conf
new file mode 100644
index 00000000..aadd2e5d
--- /dev/null
+++ b/recipes/wii/devkitwii.conf
@@ -0,0 +1,8 @@
+PATH /c/Toolchains/devkitPro/devkitPPC/bin/
+platform wii
+PLATFORM wii
+CC powerpc-eabi-gcc
+CXX powerpc-eabi-g++
+MAKE /mingw64/bin/mingw32-make.exe
+SUFFIX _wii
+RA YES
diff --git a/recipes/wii/devkitwii.ra b/recipes/wii/devkitwii.ra
new file mode 100644
index 00000000..944b2400
--- /dev/null
+++ b/recipes/wii/devkitwii.ra
@@ -0,0 +1,3 @@
+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