diff --git a/src/mame/drivers/quickpick5.cpp b/src/mame/drivers/quickpick5.cpp
index 81a268007bc..8cac498195e 100644
--- a/src/mame/drivers/quickpick5.cpp
+++ b/src/mame/drivers/quickpick5.cpp
@@ -9,6 +9,7 @@
 
  Driver by R. Belmont
 
+ PWB(A)352878A
  Rundown of PCB:
   Main CPU:  Z80
 
@@ -450,17 +451,37 @@ static INPUT_PORTS_START( quickpick5 )
 	PORT_BIT(0x7e, IP_ACTIVE_LOW, IPT_UNUSED)
 
 	PORT_START("SIO1")
-	PORT_BIT(0x07ff, IP_ACTIVE_HIGH, IPT_UNKNOWN)
-	// TODO
+	PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("1") PORT_CODE(KEYCODE_Q)
+	PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("2") PORT_CODE(KEYCODE_W)
+	PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("3") PORT_CODE(KEYCODE_E)
+	PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("4") PORT_CODE(KEYCODE_R)
+	PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5") PORT_CODE(KEYCODE_T)
+	PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_GAMBLE_PAYOUT)
+	PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_GAMBLE_TAKE)
+	PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_GAMBLE_BET)
+	PORT_BIT(0x540, IP_ACTIVE_HIGH, IPT_UNKNOWN)
 
 	PORT_START("SIO2")
-	PORT_BIT(0x07ff, IP_ACTIVE_HIGH, IPT_UNKNOWN)
-	// TODO
+	PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("6") PORT_CODE(KEYCODE_A)
+	PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("7") PORT_CODE(KEYCODE_S)
+	PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("8") PORT_CODE(KEYCODE_D)
+	PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("9") PORT_CODE(KEYCODE_F)
+	PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("10") PORT_CODE(KEYCODE_G)
+	PORT_BIT(0x100, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Clear")
+	PORT_BIT(0x400, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("A.S")
+	PORT_BIT(0x2e0, IP_ACTIVE_HIGH, IPT_UNKNOWN)
 
 	PORT_START("SIO3")
-	PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_START1)
-	PORT_BIT(0x05ff, IP_ACTIVE_HIGH, IPT_UNKNOWN)
-	// TODO
+	PORT_BIT(0x001, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("11") PORT_CODE(KEYCODE_Z)
+	PORT_BIT(0x002, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("12") PORT_CODE(KEYCODE_X)
+	PORT_BIT(0x004, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("13") PORT_CODE(KEYCODE_C)
+	PORT_BIT(0x008, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("14") PORT_CODE(KEYCODE_V)
+	PORT_BIT(0x010, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("15") PORT_CODE(KEYCODE_B)
+	PORT_BIT(0x020, IP_ACTIVE_HIGH, IPT_GAMBLE_HIGH)
+	PORT_BIT(0x040, IP_ACTIVE_HIGH, IPT_GAMBLE_LOW)
+	PORT_BIT(0x080, IP_ACTIVE_HIGH, IPT_GAMBLE_D_UP)
+	PORT_BIT(0x200, IP_ACTIVE_HIGH, IPT_START1)
+	PORT_BIT(0x500, IP_ACTIVE_HIGH, IPT_UNKNOWN)
 
 	PORT_START("OUT")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("hopper", hopper_device, motor_w)
@@ -649,5 +670,5 @@ ROM_START( waijockey )
 ROM_END
 
 
-GAME( 1991, quickp5,   0, quickpick5, quickpick5,  quickpick5_state, empty_init, ROT0, "Konami", "Quick Pick 5", MACHINE_NOT_WORKING)
-GAME( 1993, waijockey, 0, waijockey,  waijockey,   quickpick5_state, empty_init, ROT0, "Konami", "Wai Wai Jockey", MACHINE_NOT_WORKING)
+GAME( 1991, quickp5,   0, quickpick5, quickpick5,  quickpick5_state, empty_init, ROT0, "Konami", "Quick Pick 5", MACHINE_IMPERFECT_GRAPHICS)
+GAME( 1993, waijockey, 0, waijockey,  waijockey,   quickpick5_state, empty_init, ROT0, "Konami", "Wai Wai Jockey", MACHINE_NOT_WORKING) // works but not playable due to bad gfx