diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 2e20b613..5df6468a 100644
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -196,7 +196,7 @@ build_libretro_generic_makefile() {
     if [ $? -eq 0 ];
     then 
         echo success!
-        cp -v ${NAME}_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro$FORMAT.${FORMAT_EXT}
+        cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
     else
         echo error while compiling $1
     fi
@@ -246,7 +246,7 @@ build_libretro_generic_gl_makefile() {
     if [ $? -eq 0 ];
     then 
         echo success!
-        cp -v ${NAME}_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro$FORMAT.${FORMAT_EXT}
+        cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
     else
         echo error while compiling $1
     fi
@@ -313,12 +313,12 @@ build_libretro_bsnes() {
         echo success!
         if [ "${PROFILE}" == "cpp98" ];
         then
-            cp -fv "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}.${FORMAT_EXT}"
+            cp -fv "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
         elif [ "${PROFILE}" == "bnes" ];
         then
-            cp -fv "libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}.${FORMAT_EXT}"
+            cp -fv "libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
         else
-            cp -fv "out/${NAME}_libretro$FORMAT.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro$FORMAT.${FORMAT_EXT}
+            cp -fv "out/${NAME}_libretro$FORMAT.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
         fi
     else
         echo error while compiling $1
@@ -394,7 +394,7 @@ while read line; do
 
 	ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"  
 
-        echo ARGS: $ARGS
+    echo ARGS: $ARGS
 	echo
 	echo
 
@@ -410,7 +410,7 @@ while read line; do
                 then
                     BUILD="NO"
        	        else
-		    BUILD="YES"
+					BUILD="YES"
                 fi
 
                 if [ "${PREVCORE}" == "bsnes" -a "${PREVBUILD}" == "YES" -a "${COMMAND}" == "BSNES" ]; then
@@ -431,13 +431,38 @@ while read line; do
 
                 cd ..
 
-	    else
+			else
                 echo "cloning repo..."
                 git clone --depth=1 "$URL" "$DIR"
                 BUILD="YES"
-            fi
+			fi
+		elif [ "${TYPE}" == "psp_hw_render" ]; 
+		then
+            if [ -d "${DIR}/.git" ];
+            then
+
+                cd $DIR
+                echo "pulling from repo... "
+                OUT=`git pull`				
+                if [[ $OUT == *"Already up-to-date"* ]]
+                then
+                    BUILD="NO"
+       	        else
+					BUILD="YES"
+                fi
+                cd ..
+
+			else
+                echo "cloning repo..."
+                git clone "$URL" "$DIR"
+				cd $DIR				
+				git checkout $TYPE
+				cd ..
+                BUILD="YES"
+			fi		
+		
         elif [ "${TYPE}" == "SUBMODULE" ]; 
-	then
+		then
             if [ -d "${DIR}/.git" ];
             then
 
@@ -449,20 +474,17 @@ while read line; do
                 then
                     BUILD="NO"
        	        else
-		    BUILD="YES"
+					BUILD="YES"
                 fi
 
                 cd ..
-
 	    else
                 echo "cloning repo..."
                 git clone --depth=1 "$URL" "$DIR"
                 cd $DIR
                 git submodule update --init
                 BUILD="YES"
-            fi
-            
-
+            fi            
         fi
 
         if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
@@ -492,4 +514,24 @@ while read line; do
 
 done  < $1
 
+echo "Building RetroArch"
+echo ============================================
+
+if [ "${PLATFORM}" == "psp1" ];
+then
+
+	cd retroarch
+	git pull
+	rm -rfv psp1/pkg/
+	cd dist-scripts
+	rm *.a
+	cp -v $RARCH_DIST_DIR/* .
+	sh ./psp1-cores.sh
+	
+	
+	
+
+fi
+
+
 PATH=$ORIGPATH
diff --git a/libretro-config.sh b/libretro-config.sh
index 2b125247..86c2c281 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -47,6 +47,10 @@ case "$platform" in
       FORMAT_EXT='dll'
       FORMAT_COMPILER_TARGET=win
       DIST_DIR=win_x64;;
+   *psp1*)
+      FORMAT_EXT='a'
+	  FORMAT_COMPILER_TARGET=psp1
+	  DIST_DIR=psp1;;
    *)
       FORMAT_EXT='so'
       FORMAT_COMPILER_TARGET=unix
diff --git a/recipes/recipes.pspsdk b/recipes/recipes.pspsdk
index 2716e406..6fd53c1e 100644
--- a/recipes/recipes.pspsdk
+++ b/recipes/recipes.pspsdk
@@ -1 +1,7 @@
-retroarch retroarch  https://github.com/libretro/RetroArch PROJECT YES GENERIC Makefile .
\ No newline at end of file
+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/recipes.pspsdk.conf b/recipes/recipes.pspsdk.conf
index b9c6aa0d..72f71754 100644
--- a/recipes/recipes.pspsdk.conf
+++ b/recipes/recipes.pspsdk.conf
@@ -1,2 +1,5 @@
-PATH /c/pspsdk/bin
+PATH /c/Toolchains/pspsdk/bin
 platform psp1
+CC psp-gcc
+CXX psp-g++
+MAKE /mingw64/bin/mingw32-make.exe