diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index c43253be67..7a65e90bb4 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -247,21 +247,35 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"EMS USB2",
 		{
 			// Player 1.
-			{ 0, JOY_13,		DANCE_BUTTON_UP,		false },
-			{ 0, JOY_16,		DANCE_BUTTON_LEFT,		false },
-			{ 0, JOY_14,		DANCE_BUTTON_RIGHT,		false },
-			{ 0, JOY_15,		DANCE_BUTTON_DOWN,		false },
-			{ 0, JOY_3,			DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_2,			DANCE_BUTTON_UPRIGHT,	false },
-			{ 0, JOY_10,		DANCE_BUTTON_START,		false },
+			{ 0, JOY_16,	DANCE_BUTTON_LEFT,		false },
+			{ 0, JOY_14,	DANCE_BUTTON_RIGHT,		false },
+			{ 0, JOY_13,	DANCE_BUTTON_UP,		false },
+			{ 0, JOY_15,	DANCE_BUTTON_DOWN,		false },
+			{ 1, JOY_4,		DANCE_BUTTON_LEFT,		false },
+			{ 1, JOY_2,		DANCE_BUTTON_RIGHT,		false },
+			{ 1, JOY_1,		DANCE_BUTTON_UP,		false },
+			{ 1, JOY_3,		DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_7,		DANCE_BUTTON_UPLEFT,    false },
+			{ 0, JOY_8,		DANCE_BUTTON_UPRIGHT,   false },
+			{ 0, JOY_9,		DANCE_BUTTON_SELECT,	false },
+			{ 0, JOY_10,	DANCE_BUTTON_START,		false },
+			{ 0, JOY_5,		DANCE_BUTTON_BACK,		false },
+			{ 0, JOY_6,		DANCE_BUTTON_COIN,		false },
 			// Player 2.
-			{ 0, JOY_29,		DANCE_BUTTON_UP,		true },
-			{ 0, JOY_30,		DANCE_BUTTON_RIGHT,		true },
-			{ 0, JOY_31,		DANCE_BUTTON_DOWN,		true },
-			{ 0, JOY_32,		DANCE_BUTTON_LEFT,		true },
-			{ 0, JOY_18,		DANCE_BUTTON_UPRIGHT,	true },
-			{ 0, JOY_19,		DANCE_BUTTON_UPLEFT,	true },
-			{ 0, JOY_26,		DANCE_BUTTON_START,		true },
+			{ 0, JOY_32,	DANCE_BUTTON_LEFT,		true },
+			{ 0, JOY_30,	DANCE_BUTTON_RIGHT,		true },
+			{ 0, JOY_29,	DANCE_BUTTON_UP,		true },
+			{ 0, JOY_31,	DANCE_BUTTON_DOWN,		true },
+			{ 1, JOY_20,	DANCE_BUTTON_LEFT,		true },
+			{ 1, JOY_18,	DANCE_BUTTON_RIGHT,		true },
+			{ 1, JOY_17,	DANCE_BUTTON_UP,		true },
+			{ 1, JOY_19,	DANCE_BUTTON_DOWN,		true },
+			{ 0, JOY_23,	DANCE_BUTTON_UPRIGHT,	true },
+			{ 0, JOY_24,	DANCE_BUTTON_UPLEFT,	true },
+			{ 0, JOY_25,	DANCE_BUTTON_SELECT,	true },
+			{ 0, JOY_26,	DANCE_BUTTON_START,		true },
+			{ 0, JOY_21,	DANCE_BUTTON_BACK,		true },
+			{ 0, JOY_22,	DANCE_BUTTON_COIN,		true },
 			END_MARKER
 		}
 	},