diff --git a/BizHawk.Emulation/Consoles/Sony/PSP/PSP.cs b/BizHawk.Emulation/Consoles/Sony/PSP/PSP.cs
index 0f499fa9ed..f4cb4cbc7b 100644
--- a/BizHawk.Emulation/Consoles/Sony/PSP/PSP.cs
+++ b/BizHawk.Emulation/Consoles/Sony/PSP/PSP.cs
@@ -11,7 +11,14 @@ namespace BizHawk.Emulation.Consoles.Sony.PSP
 		public static readonly ControllerDefinition PSPController = new ControllerDefinition
 		{
 			Name = "PSP Controller",
-			BoolButtons = { "TO", "BE", "CHANGED" }
+			BoolButtons =
+			{					
+				"Up", "Down", "Left", "Right", "Select", "Start", "L", "R", "Square", "Triangle", "Circle", "Cross", "Power"
+			},
+			FloatControls =
+			{
+				"Stick X", "Stick Y"
+			}
 		};
 
 		public IVideoProvider VideoProvider { get { return this; } }