diff --git a/tools/retrolaunch/cores.conf b/tools/retrolaunch/cores.conf
index ac4f8f4257..cb53e35d5f 100644
--- a/tools/retrolaunch/cores.conf
+++ b/tools/retrolaunch/cores.conf
@@ -1,15 +1,19 @@
 # Core preferences, cores are ordered by preference. If a core doesn't exist ;
 # or is marked as broken in launch.conf the next in line will be used. ;
-"ps1" mednafen-psx pcsxr ;
-"smd" genplus ;
-"nes" fceu bnes nestopia quicknes ;
-"gba" vba ;
-"a26" stella ;
-"snes" snes9x snes9x-next bsnes-compat bsnes-balanced bsnes-accuracy ;
-"gbc" gambatte ;
-"gb" gambatte ;
-"gg" genplus ;
-"nds" desmume ;
-"pce" mednafen-pce-fast ;
-"sms" genplus ;
-"wswan" mednafen-wswan ;
+"ps1" mednafen_psx_libretro pcsx_rearmed_libretro ;
+"smd" genesis_plus_gx_libretro ;
+"nes" bnes_libretro fceumm_libretro nestopia_libretro quicknes_libretro ;
+"gba" vba_next_libretro mednafen_gba_libretro ;
+"npg" mednafen_ngp_libretro ;
+"a26" stella_libretro ;
+"snes" snes9x_libretro snes9x_next_libretro mednafen_snes_libretro bsnes_libretro_performance bsnes_libretro_balanced bsnes_libretro_accuracy;
+"gbc" gambatte_libretro ;
+"gb" gambatte_libretro ;
+"gg" genesis_plus_gx_libretro ;
+"nds" desmume_libretro ;
+"pce" mednafen_pce_fast_libretro ;
+"pcecd" mednafen_pce_fast_libretro ;
+"sms" genesis_plus_gx_libretro ;
+"scd" genesis_plus_gx_libretro ;
+"wswan" mednafen_wswan_libretro ;
+"n64" mupen64plus_libretro ;
diff --git a/tools/retrolaunch/main.c b/tools/retrolaunch/main.c
index 87fc91ae1d..19e9aff19c 100644
--- a/tools/retrolaunch/main.c
+++ b/tools/retrolaunch/main.c
@@ -230,6 +230,7 @@ const char *SUFFIX_MATCH[] = {
 	".smd", "smd",
 	".sms", "sms",
 	".wsc", "wswan",
+	".z64", "n64",
 	NULL
 };
 
@@ -342,7 +343,7 @@ static int select_core(char *core_path, size_t max_len,
 	goto clean;
 
 success:
-	snprintf(core_path, max_len, "./cores/libretro-%s.so", token);
+	snprintf(core_path, max_len, "./cores/%s.so", token);
 	rv = 0;
 clean:
 	close(fd);