diff --git a/config.def.h b/config.def.h
index e66ad0c8b9..9b56cc11c9 100644
--- a/config.def.h
+++ b/config.def.h
@@ -604,7 +604,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
    { true, RARCH_MENU_TOGGLE,              RETRO_LBL_MENU_TOGGLE,          RETROK_F1,      NO_BTN, 0, AXIS_NONE },
 };
 
-// Player 2-5
+// Players 2 to MAX_PLAYERS
 static const struct retro_keybind retro_keybinds_rest[] = {
     //     | RetroPad button            | desc                           | keyboard key  | js btn |     js axis   |
    { true, RETRO_DEVICE_ID_JOYPAD_B,      RETRO_LBL_JOYPAD_B,              RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
diff --git a/driver_menu.h b/driver_menu.h
index 6344ddcd3f..a305e016ed 100644
--- a/driver_menu.h
+++ b/driver_menu.h
@@ -32,7 +32,7 @@ extern "C" {
 #define MENU_MAX_HATS 4
 
 #ifndef MAX_PLAYERS
-#define MAX_PLAYERS 8
+#define MAX_PLAYERS 16
 #endif
 
 struct menu_bind_state_port
diff --git a/general.h b/general.h
index 23364a87b3..24e62ca050 100644
--- a/general.h
+++ b/general.h
@@ -88,7 +88,7 @@
 extern "C" {
 #endif
 
-#define MAX_PLAYERS 8
+#define MAX_PLAYERS 16
 
 enum basic_event
 {
diff --git a/input/input_common.c b/input/input_common.c
index abd6bc8ca8..9ae38fedac 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -999,6 +999,14 @@ static const char *bind_player_prefix[MAX_PLAYERS] = {
    "input_player6",
    "input_player7",
    "input_player8",
+   "input_player9",
+   "input_player10",
+   "input_player11",
+   "input_player12",
+   "input_player13",
+   "input_player14",
+   "input_player15",
+   "input_player16",
 };
 
 #define DECLARE_BIND(x, bind, desc) { true, 0, #x, desc, bind }
diff --git a/retroarch.c b/retroarch.c
index 84fccc7606..997329b8a3 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -839,6 +839,14 @@ static int16_t input_state(unsigned port, unsigned device,
       g_settings.input.binds[5],
       g_settings.input.binds[6],
       g_settings.input.binds[7],
+      g_settings.input.binds[8],
+      g_settings.input.binds[9],
+      g_settings.input.binds[10],
+      g_settings.input.binds[11],
+      g_settings.input.binds[12],
+      g_settings.input.binds[13],
+      g_settings.input.binds[14],
+      g_settings.input.binds[15],
    };
 
    if (!driver.block_libretro_input && (id < RARCH_FIRST_META_KEY ||
@@ -2516,6 +2524,14 @@ static void check_turbo(void)
       g_settings.input.binds[5],
       g_settings.input.binds[6],
       g_settings.input.binds[7],
+      g_settings.input.binds[8],
+      g_settings.input.binds[9],
+      g_settings.input.binds[10],
+      g_settings.input.binds[11],
+      g_settings.input.binds[12],
+      g_settings.input.binds[13],
+      g_settings.input.binds[14],
+      g_settings.input.binds[15],
    };
 
    g_extern.turbo_count++;