diff --git a/config.def.h b/config.def.h
index b692b11be4..466069ba2c 100644
--- a/config.def.h
+++ b/config.def.h
@@ -37,6 +37,7 @@ enum
    VIDEO_WII,
    VIDEO_XENON360,
    VIDEO_XDK_D3D,
+   VIDEO_PSP2_GXM,
    VIDEO_D3D9,
    VIDEO_VG,
    VIDEO_NULL,
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 1e13913148..71daa7b975 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -162,6 +162,8 @@ VIDEO DRIVER
 #include "../../wii/mem2_manager.c"
 #endif
 #include "../../gx/gx_video.c"
+#elif defined(SN_TARGET_PSP2)
+#include "../../psp2/psp2_video.c"
 #endif
 
 #ifdef HAVE_DYLIB
diff --git a/driver.c b/driver.c
index 93ed76c169..21cca303d4 100644
--- a/driver.c
+++ b/driver.c
@@ -98,6 +98,9 @@ static const video_driver_t *video_drivers[] = {
 #if defined(HAVE_WIN32_D3D9)
    &video_d3d9,
 #endif
+#ifdef SN_TARGET_PSP2
+   &video_psp2_gxm,
+#endif
 #ifdef HAVE_SDL
    &video_sdl,
 #endif
diff --git a/driver.h b/driver.h
index e92e8c2a08..6d437f42bf 100644
--- a/driver.h
+++ b/driver.h
@@ -290,6 +290,7 @@ extern const audio_driver_t audio_ps3;
 extern const audio_driver_t audio_gx;
 extern const audio_driver_t audio_null;
 extern const video_driver_t video_gl;
+extern const video_driver_t video_psp2_gxm;
 extern const video_driver_t video_d3d9;
 extern const video_driver_t video_gx;
 extern const video_driver_t video_xenon360;
diff --git a/psp2/psp2_video.c b/psp2/psp2_video.c
index e28cb502da..74a295a0d3 100644
--- a/psp2/psp2_video.c
+++ b/psp2/psp2_video.c
@@ -519,7 +519,7 @@ static void psp2_gfx_restart(void) {}
 static void psp2_gfx_stop(void) {}
 #endif
 
-const video_driver_t video_null = {
+const video_driver_t video_psp2_gxm = {
    psp2_gfx_init,
    psp2_gfx_frame,
    psp2_gfx_set_nonblock_state,
@@ -527,7 +527,7 @@ const video_driver_t video_null = {
    psp2_gfx_focus,
    NULL,
    psp2_gfx_free,
-   "null",
+   "psp2_gxm",
 
 #ifdef RARCH_CONSOLE
    psp2_gfx_start,
diff --git a/settings.c b/settings.c
index 4a4c65d48d..0b78266c3d 100644
--- a/settings.c
+++ b/settings.c
@@ -90,6 +90,8 @@ const char *config_get_default_video(void)
          return "xdk_d3d";
       case VIDEO_D3D9:
          return "d3d9";
+      case VIDEO_PSP2_GXM:
+         return "psp2_gxm";
       case VIDEO_XVIDEO:
          return "xvideo";
       case VIDEO_SDL: