diff --git a/workspace/all/minarch/ma_config.c b/workspace/all/minarch/ma_config.c
index 83ba20627..438a0a65b 100644
--- a/workspace/all/minarch/ma_config.c
+++ b/workspace/all/minarch/ma_config.c
@@ -1226,6 +1226,8 @@ static const char* device_button_names[LOCAL_BUTTON_COUNT] = {
 	[BTN_ID_R2]			= "R2",
 	[BTN_ID_L3]			= "L3",
 	[BTN_ID_R3]			= "R3",
+	[BTN_ID_L4]			= "L4",
+	[BTN_ID_R4]			= "R4",
 };
 
 
@@ -1248,6 +1250,8 @@ char* button_labels[] = {
 	"R2",
 	"L3",
 	"R3",
+	"L4",
+	"R4",
 	"MENU+UP",
 	"MENU+DOWN",
 	"MENU+LEFT",
@@ -1264,6 +1268,8 @@ char* button_labels[] = {
 	"MENU+R2",
 	"MENU+L3",
 	"MENU+R3",
+	"MENU+L4",
+	"MENU+R4",
 	NULL,
 };
 static char* overclock_labels[] = {
diff --git a/workspace/all/minarch/ma_internal.h b/workspace/all/minarch/ma_internal.h
index 28ffcaa57..49d4a8935 100644
--- a/workspace/all/minarch/ma_internal.h
+++ b/workspace/all/minarch/ma_internal.h
@@ -135,7 +135,7 @@ extern int rewind_init_ready;
    Moved from minarch.c so the input module can access them.
    ----------------------------------------------------------------------- */
 
-#define LOCAL_BUTTON_COUNT 16 // depends on device
+#define LOCAL_BUTTON_COUNT 18 // depends on device
 #define RETRO_BUTTON_COUNT 16 // allow L3/R3 to be remapped by user if desired, eg. Virtual Boy uses extra buttons for right d-pad
 
 typedef struct ButtonMapping {