diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 44704e916b..103b140b4f 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -77,7 +77,7 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
    logger_init();
 #elif defined(HAVE_FILE_LOGGER)
 #ifndef VITA
-   retro_main_log_file_init("ms0:/retroarch-log.txt");
+   retro_main_log_file_init("ms0:/temp/retroarch-log.txt");
 #else
    retro_main_log_file_init("ux0:/temp/retroarch-log.txt");
 #endif
@@ -88,22 +88,20 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
    strlcpy(eboot_path, "ux0:/data/retroarch/", sizeof(eboot_path));
    strlcpy(g_defaults.dir.port, eboot_path, sizeof(g_defaults.dir.port));
 #else
-   strlcpy(eboot_path, argv[0], sizeof(eboot_path));
+   strlcpy(eboot_path, "ms0:/retroarch/", sizeof(eboot_path));
    fill_pathname_basedir(g_defaults.dir.port, argv[0], sizeof(g_defaults.dir.port));
 #endif
    RARCH_LOG("port dir: [%s]\n", g_defaults.dir.port);
 
    strlcpy(g_defaults.dir.content_history,
          g_defaults.dir.port, sizeof(g_defaults.dir.content_history));
+   fill_pathname_join(g_defaults.path.config, g_defaults.dir.port,
+         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
+#ifdef VITA
    fill_pathname_join(g_defaults.dir.core_assets, g_defaults.dir.port,
          "downloads", sizeof(g_defaults.dir.core_assets));
-#ifdef VITA
    fill_pathname_join(g_defaults.dir.assets, "app0:/",
          "assets", sizeof(g_defaults.dir.assets));
-#else
-   fill_pathname_join(g_defaults.dir.assets, g_defaults.dir.port,
-         "media", sizeof(g_defaults.dir.assets));
-#endif
    fill_pathname_join(g_defaults.dir.core, g_defaults.dir.port,
          "cores", sizeof(g_defaults.dir.core));
    fill_pathname_join(g_defaults.dir.core_info, g_defaults.dir.core,
@@ -116,8 +114,6 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
          "system", sizeof(g_defaults.dir.system));
    fill_pathname_join(g_defaults.dir.playlist, g_defaults.dir.core,
          "playlists", sizeof(g_defaults.dir.playlist));
-   fill_pathname_join(g_defaults.path.config, g_defaults.dir.port,
-         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
    fill_pathname_join(g_defaults.dir.cheats, g_defaults.dir.port,
          "cheats", sizeof(g_defaults.dir.cheats));
    fill_pathname_join(g_defaults.dir.menu_config, g_defaults.dir.port,
@@ -128,6 +124,32 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
          "database/cursors", sizeof(g_defaults.dir.cursor));
    fill_pathname_join(g_defaults.dir.database,   g_defaults.dir.core,
          "database/rdb", sizeof(g_defaults.dir.database));
+#else
+   fill_pathname_join(g_defaults.dir.assets, g_defaults.dir.port,
+         "media", sizeof(g_defaults.dir.assets));
+   fill_pathname_join(g_defaults.dir.core, g_defaults.dir.port,
+         "cores", sizeof(g_defaults.dir.core));
+   fill_pathname_join(g_defaults.dir.core_info, g_defaults.dir.core,
+         "info", sizeof(g_defaults.dir.core_info));
+   fill_pathname_join(g_defaults.dir.savestate, g_defaults.dir.core,
+         "userdata/savestates", sizeof(g_defaults.dir.savestate));
+   fill_pathname_join(g_defaults.dir.sram, g_defaults.dir.core,
+         "userdata/savefiles", sizeof(g_defaults.dir.sram));
+   fill_pathname_join(g_defaults.dir.system, g_defaults.dir.core,
+         "userdata/system", sizeof(g_defaults.dir.system));
+   fill_pathname_join(g_defaults.dir.playlist, g_defaults.dir.core,
+         "userdata/playlists", sizeof(g_defaults.dir.playlist));
+   fill_pathname_join(g_defaults.dir.cheats, g_defaults.dir.port,
+         "userdata/cheats", sizeof(g_defaults.dir.cheats));
+   fill_pathname_join(g_defaults.dir.menu_config, g_defaults.dir.port,
+         "userdata/config", sizeof(g_defaults.dir.menu_config));
+   fill_pathname_join(g_defaults.dir.remap, g_defaults.dir.port,
+         "userdata/remaps", sizeof(g_defaults.dir.remap));
+   fill_pathname_join(g_defaults.dir.cursor,   g_defaults.dir.core,
+         "database/cursors", sizeof(g_defaults.dir.cursor));
+   fill_pathname_join(g_defaults.dir.database,   g_defaults.dir.core,
+         "database/rdb", sizeof(g_defaults.dir.database));
+#endif
 
 #ifdef VITA
    fill_pathname_join(g_defaults.dir.overlay, g_defaults.dir.core,