diff --git a/tools/joystick/joystickd.py b/tools/joystick/joystickd.py
index 8374cf8a74..b31dab83fe 100755
--- a/tools/joystick/joystickd.py
+++ b/tools/joystick/joystickd.py
@@ -38,13 +38,20 @@ class Keyboard:
 
 
 class Joystick:
-  def __init__(self):
+  def __init__(self, gamepad=False):
     # TODO: find a way to get this from API, perhaps "inputs" doesn't support it
-    self.min_axis_value = {'ABS_Y': 0., 'ABS_RZ': 0.}
-    self.max_axis_value = {'ABS_Y': 255., 'ABS_RZ': 255.}
-    self.cancel_button = 'BTN_TRIGGER'
-    self.axes_values = {'ABS_Y': 0., 'ABS_RZ': 0.}  # gb, steer
-    self.axes_order = ['ABS_Y', 'ABS_RZ']
+    if gamepad:
+      self.cancel_button = 'BTN_NORTH'  # (BTN_NORTH=X, ABS_RZ=Right Trigger)
+      accel_axis = 'ABS_Y'
+      steer_axis = 'ABS_RX'
+    else:
+      self.cancel_button = 'BTN_TRIGGER'
+      accel_axis = 'ABS_Y'
+      steer_axis = 'ABS_RZ'
+    self.min_axis_value = {accel_axis: 0., steer_axis: 0.}
+    self.max_axis_value = {accel_axis: 255., steer_axis: 255.}
+    self.axes_values = {accel_axis: 0., steer_axis: 0.}
+    self.axes_order = [accel_axis, steer_axis]
     self.cancel = False
 
   def update(self):
@@ -80,9 +87,8 @@ def send_thread(joystick):
       requests.get("http://"+os.environ["WEB"]+":5000/control/%f/%f" % tuple([joystick.axes_values[a] for a in joystick.axes_order][::-1]), timeout=None)
     rk.keep_time()
 
-def joystick_thread(use_keyboard):
+def joystick_thread(joystick):
   Params().put_bool('JoystickDebugMode', True)
-  joystick = Keyboard() if use_keyboard else Joystick()
   threading.Thread(target=send_thread, args=(joystick,), daemon=True).start()
   while True:
     joystick.update()
@@ -92,6 +98,7 @@ if __name__ == '__main__':
                                                'openpilot must be offroad before starting joysticked.',
                                    formatter_class=argparse.ArgumentDefaultsHelpFormatter)
   parser.add_argument('--keyboard', action='store_true', help='Use your keyboard instead of a joystick')
+  parser.add_argument('--gamepad', action='store_true', help='Use gamepad configuration instead of joystick')
   args = parser.parse_args()
 
   if not Params().get_bool("IsOffroad") and "ZMQ" not in os.environ and "WEB" not in os.environ:
@@ -108,4 +115,5 @@ if __name__ == '__main__':
   else:
     print('Using joystick, make sure to run cereal/messaging/bridge on your device if running over the network!')
 
-  joystick_thread(args.keyboard)
+  joystick = Keyboard() if args.keyboard else Joystick(args.gamepad)
+  joystick_thread(joystick)