diff --git a/Makefile.psp1 b/Makefile.psp1
index 26cec70d6a..3ff29be9b6 100644
--- a/Makefile.psp1
+++ b/Makefile.psp1
@@ -4,11 +4,11 @@ TARGET = retroarch_psp
 OBJS = console/griffin/griffin.o
 
 INCDIR = 
-CFLAGS = -O2 -G0 -Wall -std=gnu99 -G 4
-CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti -G 4
+CFLAGS = -O2 -G0 -Wall -std=gnu99 
+CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 
-RARCH_DEFINES = -DPSP -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_FILEBROWSER -DHAVE_RARCH_MAIN_WRAP -DHAVE_ZLIB -DWANT_RZLIB -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main
+RARCH_DEFINES = -DPSP -DHAVE_DEFAULT_RETROPAD_INPUT -DRARCH_CONSOLE -DHAVE_GETOPT_LONG -DHAVE_FILEBROWSER -DHAVE_RARCH_MAIN_WRAP -DHAVE_ZLIB -DWANT_RZLIB -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main
 CFLAGS += $(RARCH_DEFINES)
 
 LIBDIR =
diff --git a/psp/psp_input.c b/psp/psp_input.c
index 1a6ac5b22c..a437b714b0 100644
--- a/psp/psp_input.c
+++ b/psp/psp_input.c
@@ -37,6 +37,54 @@
 
 #define MAX_PADS 1
 
+const struct platform_bind platform_keys[] = {
+   { PSP_GAMEPAD_CIRCLE, "Circle button" },
+   { PSP_GAMEPAD_CROSS, "Cross button" },
+   { PSP_GAMEPAD_TRIANGLE, "Triangle button" },
+   { PSP_GAMEPAD_SQUARE, "Square button" },
+   { PSP_GAMEPAD_DPAD_UP, "D-Pad Up" },
+   { PSP_GAMEPAD_DPAD_DOWN, "D-Pad Down" },
+   { PSP_GAMEPAD_DPAD_LEFT, "D-Pad Left" },
+   { PSP_GAMEPAD_DPAD_RIGHT, "D-Pad Right" },
+   { PSP_GAMEPAD_SELECT, "Select button" },
+   { PSP_GAMEPAD_START, "Start button" },
+   { PSP_GAMEPAD_L, "L button" },
+   { 0, "Unused" },
+   { 0, "Unused" },
+   { PSP_GAMEPAD_R, "R button" },
+   { 0, "Unused" },
+   { 0, "Unused" },
+   { PSP_GAMEPAD_LSTICK_LEFT_MASK, "LStick Left" },
+   { PSP_GAMEPAD_LSTICK_RIGHT_MASK, "LStick Right" },
+   { PSP_GAMEPAD_LSTICK_UP_MASK, "LStick Up" },
+   { PSP_GAMEPAD_LSTICK_DOWN_MASK, "LStick Down" },
+   { PSP_GAMEPAD_DPAD_LEFT | PSP_GAMEPAD_LSTICK_LEFT_MASK, "LStick D-Pad Left" },
+   { PSP_GAMEPAD_DPAD_RIGHT | PSP_GAMEPAD_LSTICK_RIGHT_MASK, "LStick D-Pad Right" },
+   { PSP_GAMEPAD_DPAD_UP | PSP_GAMEPAD_LSTICK_UP_MASK, "LStick D-Pad Up" },
+   { PSP_GAMEPAD_DPAD_DOWN | PSP_GAMEPAD_LSTICK_DOWN_MASK, "LStick D-Pad Down" },
+#ifdef SN_TARGET_PSP2
+   { PSP_GAMEPAD_RSTICK_LEFT_MASK, "RStick Left" },
+   { PSP_GAMEPAD_RSTICK_RIGHT_MASK, "RStick Right" },
+   { PSP_GAMEPAD_RSTICK_UP_MASK, "RStick Up" },
+   { PSP_GAMEPAD_RSTICK_DOWN_MASK, "RStick Down" },
+   { PSP_GAMEPAD_DPAD_LEFT | PSP_GAMEPAD_RSTICK_LEFT_MASK, "RStick D-Pad Left" },
+   { PSP_GAMEPAD_DPAD_RIGHT | PSP_GAMEPAD_RSTICK_RIGHT_MASK, "RStick D-Pad Right" },
+   { PSP_GAMEPAD_DPAD_UP | PSP_GAMEPAD_RSTICK_UP_MASK, "RStick D-Pad Up" },
+   { PSP_GAMEPAD_DPAD_DOWN | PSP_GAMEPAD_RSTICK_DOWN_MASK, "RStick D-Pad Down" },
+#else
+   { 0, "Unused" },
+   { 0, "Unused" },
+   { 0, "Unused" },
+   { 0, "Unused" },
+   { 0, "Unused" },
+   { 0, "Unused" },
+   { 0, "Unused" },
+   { 0, "Unused" },
+#endif
+};
+
+const unsigned platform_keys_size = sizeof(platform_keys);
+
 static uint64_t state;
 
 static void psp_input_poll(void *data)