diff --git a/stepmania/src/RageInputDevice.h b/stepmania/src/RageInputDevice.h
index f087b1d9ee..e59bd4a38a 100644
--- a/stepmania/src/RageInputDevice.h
+++ b/stepmania/src/RageInputDevice.h
@@ -184,7 +184,7 @@ enum RageKeySym
 };
 
 const int NUM_KEYBOARD_BUTTONS = NUM_KEYS;
-const int NUM_JOYSTICKS = 6;
+const int NUM_JOYSTICKS = 16;
 const int NUM_PUMPS = 2;
 const int NUM_PARAS = 2;
 
@@ -196,6 +196,16 @@ enum InputDevice {
 	DEVICE_JOY4,
 	DEVICE_JOY5,
 	DEVICE_JOY6,
+	DEVICE_JOY7,
+	DEVICE_JOY8,
+	DEVICE_JOY9,
+	DEVICE_JOY10,
+	DEVICE_JOY11,
+	DEVICE_JOY12,
+	DEVICE_JOY13,
+	DEVICE_JOY14,
+	DEVICE_JOY15,
+	DEVICE_JOY16,
 	DEVICE_PUMP1,
 	DEVICE_PUMP2,
 	DEVICE_PARA,