diff --git a/src/g_input.c b/src/g_input.c
index a2b23762f..d6d62818e 100644
--- a/src/g_input.c
+++ b/src/g_input.c
@@ -459,12 +459,17 @@ static keyname_t keynames[] =
 	{KEY_JOY1+12, "D-PAD DOWN"},
 	{KEY_JOY1+13, "D-PAD LEFT"},
 	{KEY_JOY1+14, "D-PAD RIGHT"},
-	{KEY_JOY1+15, "MISC. BUTTON"},
-	{KEY_JOY1+16, "PADDLE1 BUTTON"},
-	{KEY_JOY1+17, "PADDLE2 BUTTON"},
-	{KEY_JOY1+18, "PADDLE3 BUTTON"},
-	{KEY_JOY1+19, "PADDLE4 BUTTON"},
+	{KEY_JOY1+15, "MISC. BUTTON 1"},
+	{KEY_JOY1+16, "PADDLE BUTTON 1"},
+	{KEY_JOY1+17, "PADDLE BUTTON 2"},
+	{KEY_JOY1+18, "PADDLE BUTTON 3"},
+	{KEY_JOY1+19, "PADDLE BUTTON 4"},
 	{KEY_JOY1+20, "TOUCHPAD"},
+	{KEY_JOY1+21, "MISC. BUTTON 2"},
+	{KEY_JOY1+22, "MISC. BUTTON 3"},
+	{KEY_JOY1+23, "MISC. BUTTON 4"},
+	{KEY_JOY1+24, "MISC. BUTTON 5"},
+	{KEY_JOY1+25, "MISC. BUTTON 6"},
 
 	{KEY_AXIS1+0, "L-STICK LEFT"},
 	{KEY_AXIS1+1, "L-STICK RIGHT"},