diff --git a/Makefile.psp1 b/Makefile.psp1
index 1f5fc70b61..eb919257bc 100644
--- a/Makefile.psp1
+++ b/Makefile.psp1
@@ -35,6 +35,10 @@ ifeq ($(HAVE_KERNEL_PRX), 1)
 CFLAGS      += -DHAVE_KERNEL_PRX
 endif
 
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+LDFLAGS += -Wl, --whole-archive
+endif
+
 CFLAGS += $(RARCH_DEFINES)
 
 
diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander
index 229279ed60..6737ad327d 100644
--- a/Makefile.psp1.salamander
+++ b/Makefile.psp1.salamander
@@ -1,4 +1,5 @@
 BUILD_PRX         = 1
+HAVE_FILE_LOGGER  = 0
 DEBUG             = 0
 
 TARGET = retroarchpsp_salamander
diff --git a/dist-scripts/psp1-cores.sh b/dist-scripts/psp1-cores.sh
index df4680272c..d50eb9c529 100755
--- a/dist-scripts/psp1-cores.sh
+++ b/dist-scripts/psp1-cores.sh
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-#make -C ../ -f Makefile.wii.salamander clean || exit 1
-make -C ../ -f Makefile.psp1 clean || exit 1
+mkdir -p ../psp1/pkg/cores/
 
-#make -C ../ -f Makefile.wii.salamander || exit 1
-make -C ../ -f Makefile.psp1 || exit 1
+make -C ../psp1/kernelFunctionsPrx/ clean || exit 1
+make -C ../psp1/kernelFunctionsPrx/ || exit 1
+cp -f ../kernel_functions.prx ../psp1/pkg/kernel_functions.prx
+
+make -C ../ -f Makefile.psp1.salamander clean || exit 1
+make -C ../ -f Makefile.psp1.salamander || exit 1
+mv -f ../EBOOT.PBP ../psp1/pkg/EBOOT.PBP
+
+make -C ../ -f Makefile.psp1 clean || exit 1
 
 for f in *_psp1.a ; do
    name=`echo "$f" | sed 's/\(_libretro_psp1\|\).a$//'`
@@ -20,6 +26,6 @@ for f in *_psp1.a ; do
    fi
    cp -f "$f" ../libretro_psp1.a
    make -C ../ -f Makefile.psp1 $whole_archive $big_stack -j3 || exit 1
-   mv -f ../retroarchpsp.prx ../psp1/pkg/${name}_libretro_psp1.prx
-   rm -f ../retroarchpsp.prx ../retroarchpsp.elf
+   mv -f ../EBOOT.PBP ../psp1/pkg/cores/${name}_libretro.PBP
+   rm -f ../retroarchpsp.elf
 done
diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c
index 965518e542..40d75b227f 100644
--- a/frontend/platform/platform_psp.c
+++ b/frontend/platform/platform_psp.c
@@ -136,13 +136,14 @@ static void frontend_psp_deinit(void *data)
    (void)data;
 #ifndef IS_SALAMANDER
    g_extern.verbose = false;
-#endif
 
 #ifdef HAVE_FILE_LOGGER
    if (g_extern.log_file)
       fclose(g_extern.log_file);
    g_extern.log_file = NULL;
 #endif
+
+#endif
 }
 
 static void frontend_psp_shutdown(bool unused)