diff --git a/input/input_autodetect_builtin.c b/input/input_autodetect_builtin.c
index 7f6dce1131..afb4993f14 100644
--- a/input/input_autodetect_builtin.c
+++ b/input/input_autodetect_builtin.c
@@ -101,15 +101,15 @@ DECL_BTN(b, 96) \
 DECL_BTN(x, 100) \
 DECL_BTN(y, 99) \
 DECL_BTN(start, 108) \
-DECL_BTN(select, 4) \
+DECL_BTN(select, 109) \
 DECL_BTN(up, h0up) \
 DECL_BTN(down, h0down) \
 DECL_BTN(left, h0left) \
 DECL_BTN(right, h0right) \
 DECL_BTN(l, 102) \
 DECL_BTN(r, 103) \
-DECL_AXIS(l2, +6) \
-DECL_AXIS(r2, +7) \
+DECL_BTN(l2, 104) \
+DECL_BTN(r2, 105) \
 DECL_BTN(l3, 106) \
 DECL_BTN(r3, 107) \
 DECL_AXIS(l_x_plus,  +0) \