diff --git a/libretro-build-bsd.sh b/libretro-build-bsd.sh
index 5e08301c..f489a4fc 100755
--- a/libretro-build-bsd.sh
+++ b/libretro-build-bsd.sh
@@ -107,7 +107,7 @@ build_default_cores() {
 	libretro_build_core 2048
 	libretro_build_core bluemsx
 
-	if [ $platform != "psp1" ] && [ $platform != "ngc" ] && [ $platform != "wii" ] && [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "vita" ]; then
+	if [ $platform != "psp1" ] && [ $platform != "ngc" ] && [ $platform != "wii" ] && [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "psl1ght" ] &&  [ $platform != "vita" ]; then
 		libretro_build_core dosbox
 	fi
 
@@ -158,13 +158,13 @@ build_default_cores() {
 	libretro_build_core gw
 	libretro_build_core prosystem
 
-	if [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "vita" ]; then
+	if [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "psl1ght" ] && [ $platform != "vita" ]; then
 		libretro_build_core 81
 		libretro_build_core fuse
 		libretro_build_core lutro
 	fi
 
-	if [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "wii" ] && [ $platform != "wiiu" ] && [ $platform != "ngc" ] && [ $platform != "vita" ]; then
+	if [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "psl1ght" ] && [ $platform != "wii" ] && [ $platform != "wiiu" ] && [ $platform != "ngc" ] && [ $platform != "vita" ]; then
 		build_default_cores_little_endian_only
 
 		build_default_cores_libretro_gl
diff --git a/libretro-build-psl1ght.sh b/libretro-build-psl1ght.sh
new file mode 100755
index 00000000..78f84ece
--- /dev/null
+++ b/libretro-build-psl1ght.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=psl1ght ${BASE_DIR}/libretro-build.sh $@
diff --git a/libretro-build.sh b/libretro-build.sh
index 1ab6ab47..07abe54c 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -159,7 +159,7 @@ build_default_cores() {
 	libretro_build_core 2048
 	libretro_build_core bluemsx
 
-	if [ $platform != "psp1" ] && [ $platform != "ngc" ] && [ $platform != "wii" ] && [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "vita" ]; then
+	if [ $platform != "psp1" ] && [ $platform != "ngc" ] && [ $platform != "wii" ] && [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "psl1ght" ] && [ $platform != "vita" ]; then
 		libretro_build_core dosbox
 	fi
 
@@ -173,7 +173,12 @@ build_default_cores() {
 	libretro_build_core fmsx
 	libretro_build_core gambatte
 	libretro_build_core handy
-	libretro_build_core stella
+	if [ $platform != "psl1ght" ]; then
+		# Excluded due to the gcc version PSL1GHT comes with beeing too old
+		libretro_build_core stella
+	else
+		libretro_build_core stella2014
+	fi
 	libretro_build_core nestopia
 	libretro_build_core numero
 	libretro_build_core nxengine
@@ -210,13 +215,13 @@ build_default_cores() {
 	libretro_build_core gw
 	libretro_build_core prosystem
 
-	if [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "vita" ]; then
+	if [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "psl1ght" ] && [ $platform != "vita" ]; then
 		libretro_build_core 81
 		libretro_build_core fuse
 		libretro_build_core lutro
 	fi
 
-	if [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "wii" ] && [ $platform != "wiiu" ] && [ $platform != "ngc" ] && [ $platform != "vita" ]; then
+	if [ $platform != "ps3" ] && [ $platform != "sncps3" ] && [ $platform != "psl1ght" ] && [ $platform != "wii" ] && [ $platform != "wiiu" ] && [ $platform != "ngc" ] && [ $platform != "vita" ]; then
 		build_default_cores_little_endian_only
 
 		build_default_cores_libretro_gl
diff --git a/libretro-config.sh b/libretro-config.sh
index b85613c7..3a048e53 100644
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -510,16 +510,16 @@ case "$platform" in
 		CXX="psp-g++${BINARY_EXT}"
 		;;
 
-        psl1ght)
-		DIST_DIR="psl1ght"
-		FORMAT_EXT=a
-		FORMAT=_psl1ght
-		FORMAT_COMPILER_TARGET=psl1ght
-		FORMAT_COMPILER_TARGET_ALT=psl1ght
-
-		CC="powerpc64-ps3-elf-gcc${BINARY_EXT}"
-		CXX="powerpc64-ps3-elf-g++${BINARY_EXT}"
-		;;
+    psl1ght)
+	DIST_DIR="psl1ght"
+	FORMAT_EXT=a
+	FORMAT=_psl1ght
+	FORMAT_COMPILER_TARGET=psl1ght
+	FORMAT_COMPILER_TARGET_ALT=psl1ght
+	
+	CC="powerpc64-ps3-elf-gcc${BINARY_EXT}"
+	CXX="powerpc64-ps3-elf-g++${BINARY_EXT}"
+	;;
 
 	ps2)
 		DIST_DIR="ps2"
diff --git a/recipes/playstation/psl1ght b/recipes/playstation/psl1ght
index 952b5e88..79c922db 100644
--- a/recipes/playstation/psl1ght
+++ b/recipes/playstation/psl1ght
@@ -1,43 +1,51 @@
 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 NO GENERIC Makefile .
+atari800 libretro-atari800 https://github.com/libretro/libretro-atari800.git master YES GENERIC Makefile .
 bk libretro-bk https://github.com/libretro/bk-emulator.git master YES GENERIC Makefile.libretro .
-bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile.libretro .
+bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master YES GENERIC Makefile .
 cannonball libretro-cannonball https://github.com/libretro/cannonball.git master YES GENERIC Makefile .
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
 crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 desmume2015 libretro-desmume2015 https://github.com/libretro/desmume2015.git master NO GENERIC Makefile.libretro desmume
 dice libretro-dice https://github.com/mittonk/dice-libretro.git main YES GENERIC Makefile .
-dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro NO GENERIC Makefile.libretro libretro
+dosbox_svn libretro-dosbox_svn https://github.com/libretro/dosbox-svn libretro YES GENERIC Makefile.libretro libretro
+doublecherrygb libretro-doublecherrygb https://github.com/TimOelrichs/doublecherryGB-libretro.git master YES GENERIC Makefile .
 ecwolf libretro-ecwolf https://github.com/libretro/ecwolf.git master YES GENERIC Makefile src/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 .
-fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha2012_neogeo.git master NO GENERIC Makefile .
+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_cps3 libretro-fbalpha2012_cps3 https://github.com/libretro/fbalpha2012_cps3.git master YES GENERIC makefile.libretro svn-current/trunk
+fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha2012_neogeo.git master YES GENERIC Makefile .
 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 NO GENERIC Makefile .
+fixgb libretro-fixgb https://github.com/FIX94/fixGB.git master YES GENERIC Makefile libretro
+fixnes libretro-fixnes https://github.com/FIX94/fixNES.git master YES GENERIC Makefile libretro
 freechaf libretro-freechaf https://github.com/libretro/FreeChaF.git master YES GENERIC Makefile .
 freeintv libretro-freeintv https://github.com/libretro/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 .
-gearboy libretro-gearboy https://github.com/drhelius/Gearboy.git master NO GENERIC Makefile platforms/libretro
-gearsystem libretro-gearsystem https://github.com/drhelius/Gearsystem.git master NO GENERIC Makefile platforms/libretro
-genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master NO GENERIC Makefile.libretro .
-genesis_plus_gx_wide libretro-genesis_plus_gx_wide https://github.com/libretro/Genesis-Plus-GX-Wide.git main NO GENERIC Makefile.libretro .
+gearboy libretro-gearboy https://github.com/drhelius/Gearboy.git master YES GENERIC Makefile platforms/libretro
+gearsystem libretro-gearsystem https://github.com/drhelius/Gearsystem.git master YES GENERIC Makefile platforms/libretro
+genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git master YES GENERIC Makefile.libretro .
+genesis_plus_gx_wide libretro-genesis_plus_gx_wide https://github.com/libretro/Genesis-Plus-GX-Wide.git main YES GENERIC Makefile.libretro .
 gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC Makefile .
 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 NO GENERIC Makefile .
-hatari libretro-hatari https://github.com/libretro/hatari.git master NO GENERIC Makefile.libretro .
+handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
+hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
 lutro libretro-lutro https://github.com/libretro/libretro-lutro master NO GENERIC Makefile .
 lowresnx libretro-lowresnx https://github.com/timoinutilis/lowres-nx.git retroarch YES GENERIC Makefile platform/LibRetro
-mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master NO GENERIC Makefile .
-mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git master NO GENERIC Makefile .
-mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master NO 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 .
+mame2003_midway libretro-mame2003_midway https://github.com/libretro/mame2003_midway.git master YES GENERIC Makefile .
+mame2003_plus libretro-mame2003-plus https://github.com/libretro/mame2003-plus-libretro.git master YES GENERIC Makefile .
+mame2009 libretro-mame2009 https://github.com/r-type/mame2009-libretro.git master YES GENERIC Makefile . PTR64=0 TINY=0
+mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master NO GENERIC Makefile . VRENDER=soft PTR64=0
 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_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git master YES GENERIC Makefile .
+mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-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 .
 mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git master NO GENERIC Makefile .
@@ -45,33 +53,37 @@ 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/libretro/Mu.git master YES GENERIC Makefile libretroBuildSystem
 neocd libretro-neocd https://github.com/libretro/neocd_libretro.git master YES GENERIC Makefile .
+nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC Makefile libretro
 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 sdl
+np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master NO GENERIC Makefile.libretro sdl
 numero libretro-numero https://github.com/nbarkhina/numero.git master YES GENERIC Makefile .
 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 NO 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 NO GENERIC Makefile.libretro .
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
 pocketcdg libretro-pocketcdg https://github.com/libretro/libretro-pocketcdg.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_ALT Makefile .
+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 NO GENERIC Makefile .
-puae libretro-uae https://github.com/libretro/libretro-uae.git master NO 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
-snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.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 .
 snes9x2005_plus libretro-snes9x2005_plus https://github.com/libretro/snes9x2005.git master YES GENERIC Makefile . USE_BLARGG_APU=1
 chimerasnes libretro-chimerasnes https://github.com/jamsilva/chimerasnes.git master YES GENERIC Makefile .
 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 NO 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
-test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
-tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git master NO 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 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 YES GENERIC Makefile .
 tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git master YES GENERIC Makefile .
+test libretro-samples https://github.com/libretro/libretro-samples.git master YES GENERIC Makefile tests/test
 uw8 libretro-uw8 https://github.com/libretro/uw8-libretro.git main YES GENERIC Makefile .
 uzem libretro-uzem https://github.com/libretro/libretro-uzem.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/playstation/psl1ght.ra b/recipes/playstation/psl1ght.ra
index f8d7c366..373bbf18 100644
--- a/recipes/playstation/psl1ght.ra
+++ b/recipes/playstation/psl1ght.ra
@@ -1,2 +1,6 @@
 retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES .
+overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media
+shaders shaders_cg https://github.com/libretro/common-shaders.git ASSETS YES retroarch/media
+autoconfig autoconfig https://github.com/libretro/retroarch-joypad-autoconfig.git ASSETS YES retroarch/media
+assets assets https://github.com/libretro/retroarch-assets.git ASSETS YES retroarch/media
 libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch/media
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index b9d12487..0ae106eb 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -804,7 +804,7 @@ include_core_pcsx2() {
 	register_module core "pcsx2" -theos_ios -ngc -ps3 -psp1 -wii
 }
 libretro_pcsx2_name="PCSX2"
-libretro_pcsx2_git_url="https://github.com/libretro/pcsx2.git"
+libretro_pcsx2_git_url="https://github.com/libretro/ps2.git"
 libretro_pcsx2_git_submodules="yes"
 libretro_pcsx2_build_subdir="libretro"
 libretro_pcsx2_build_makefile="Makefile"