diff --git a/Makefile.psp1 b/Makefile.psp1
index 991ebf0275..b0dd26f161 100644
--- a/Makefile.psp1
+++ b/Makefile.psp1
@@ -8,7 +8,7 @@ INCDIR =
 CFLAGS = -O2 -G0 -g -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)
 
-RARCH_DEFINES = -DPSP -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DHAVE_NULLVIDEO -DHAVE_NULLAUDIO -DRARCH_INTERNAL
+RARCH_DEFINES = -DPSP -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_GRIFFIN=1 -DHAVE_NULLVIDEO -DHAVE_NULLAUDIO -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU
 
 ifeq ($(HAVE_FILE_LOGGER), 1)
 CFLAGS		+= -DHAVE_FILE_LOGGER
diff --git a/file_ext.h b/file_ext.h
index ddcc0f1eda..798b1be7bf 100644
--- a/file_ext.h
+++ b/file_ext.h
@@ -31,6 +31,11 @@
 #define SALAMANDER_FILE "EBOOT.BIN"
 #define PLATFORM_NAME   "ps3"
 #define DEFAULT_EXE_EXT ".SELF"
+#elif defined(PSP)
+#define EXT_EXECUTABLES "pbp|PBP"
+#define SALAMANDER_FILE "EBOOT.PBP"
+#define PLATFORM_NAME   "psp"
+#define DEFAULT_EXE_EXT ".PBP"
 #elif defined(_XBOX1)
 #define EXT_EXECUTABLES "xbe|XBE"
 #define SALAMANDER_FILE "default.xbe"
diff --git a/file_path.c b/file_path.c
index 5929b61399..214181ea06 100644
--- a/file_path.c
+++ b/file_path.c
@@ -23,7 +23,7 @@
 #include "compat/posix_string.h"
 #include "miscellaneous.h"
 
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) || defined(__BLACKBERRY_QNX__)
+#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__BLACKBERRY_QNX__) || defined(PSP)
 #include <unistd.h> //stat() is defined here
 #endif
 
diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c
index a8b53719ac..0785d3d2a3 100644
--- a/frontend/platform/platform_psp.c
+++ b/frontend/platform/platform_psp.c
@@ -42,8 +42,9 @@ static int exit_callback(int arg1, int arg2, void *common)
    return 0;
 }
 
-static void get_environment_settings(int argc, char *argv[])
+static void get_environment_settings(int argc, char *argv[], void *args)
 {
+   (void)args;
 #ifndef IS_SALAMANDER
    g_extern.verbose = true;
 
diff --git a/gfx/null.c b/gfx/null.c
index c8716d162f..cc30aa8be3 100644
--- a/gfx/null.c
+++ b/gfx/null.c
@@ -77,8 +77,7 @@ const video_driver_t video_null = {
    null_gfx_free,
    "null",
 
-#ifdef RARCH_CONSOLE
-   null_gfx_start,
+#ifdef HAVE_MENU
    null_gfx_restart,
 #endif
 };
diff --git a/miscellaneous.h b/miscellaneous.h
index 73efbf5995..e941d41984 100644
--- a/miscellaneous.h
+++ b/miscellaneous.h
@@ -23,6 +23,8 @@
 #include <time/time.h>
 #elif defined(GEKKO) || defined(__PSL1GHT__) || defined(__QNX__)
 #include <unistd.h>
+#elif defined(PSP)
+#include <pspthreadman.h>
 #else
 #include <time.h>
 #endif
diff --git a/performance.c b/performance.c
index c46440892c..83c187ac69 100644
--- a/performance.c
+++ b/performance.c
@@ -198,6 +198,9 @@ retro_time_t rarch_get_time_usec(void)
    return tv.tv_sec * INT64_C(1000000) + (tv.tv_nsec + 500) / 1000;
 #elif defined(EMSCRIPTEN)
    return emscripten_get_now() * 1000;
+#elif defined(PSP)
+   SceKernelSysClock clock;
+   return sceKernelGetSystemTime(&clock);
 #else
 #error "Your platform does not have a timer function implemented in rarch_get_time_usec(). Cannot continue."
 #endif
diff --git a/psp1/psp1_video.c b/psp1/psp1_video.c
index 847fb413cd..687bf32481 100644
--- a/psp1/psp1_video.c
+++ b/psp1/psp1_video.c
@@ -192,10 +192,8 @@ const video_driver_t video_psp1 = {
    psp_free,
    "psp1",
 
-#ifdef RARCH_CONSOLE
+#if defined(HAVE_MENU)
    psp_restart,
-   NULL,
-   NULL,
 #endif
 
    psp_set_rotation,