diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs
index db456c79e6..990e31ec4e 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs
@@ -12,6 +12,7 @@ namespace BizHawk.Client.EmuHawk
 		public IEnumerable<PadSchema> GetPadSchemas()
 		{
 			yield return DualShockController(1);
+			yield return DualShockController(2);
 			yield return ConsoleButtons();
 		}
 
diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index 15aef31673..3c8ea6a87b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -33,19 +33,23 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 			BoolButtons =
 			{					
 				"P1 Up", "P1 Down", "P1 Left", "P1 Right", "P1 Select", "P1 Start", "P1 Square", "P1 Triangle", "P1 Circle", "P1 Cross", "P1 L1", 
-                "P1 R1",  "P1 L2", "P1 R2", "P1 L3", "P1 R3", "P1 MODE",  
-				//"P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Select", "P2 Start", "P2 Square", "P2 Triangle", "P2 Circle", "P2 Cross", "P2 L1", 
-          //      "P2 R1",  "P2 L2", "P2 R2", "P2 L3", "P2 R3", "P2 MODE",
+				"P1 R1",  "P1 L2", "P1 R2", "P1 L3", "P1 R3", "P1 MODE",  
+				"P2 Up", "P2 Down", "P2 Left", "P2 Right", "P2 Select", "P2 Start", "P2 Square", "P2 Triangle", "P2 Circle", "P2 Cross", "P2 L1", 
+				"P2 R1",  "P2 L2", "P2 R2", "P2 L3", "P2 R3", "P2 MODE",
 				"Eject", "Reset", 
 			},
 			FloatControls =
 			{
 				"P1 LStick X", "P1 LStick Y", "P1 RStick X", "P1 RStick Y",
-				//"P2 LStick X", "P2 LStick Y", "P2 RStick X", "P2 RStick Y",
+				"P2 LStick X", "P2 LStick Y", "P2 RStick X", "P2 RStick Y",
 				"Disc Select",
 			},
 			FloatRanges = 
 			{
+				new[] {0.0f, 128.0f, 255.0f},
+				new[] {255.0f, 128.0f, 0.0f},
+				new[] {0.0f, 128.0f, 255.0f},
+				new[] {255.0f, 128.0f, 0.0f},
 				new[] {0.0f, 128.0f, 255.0f},
 				new[] {255.0f, 128.0f, 0.0f},
 				new[] {0.0f, 128.0f, 255.0f},