diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 36477b847d..45fe44554b 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -99,6 +99,14 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 			{ 0, JOY_BUTTON_14,	DANCE_BUTTON_RIGHT,	false },
 			{ 0, JOY_BUTTON_13,	DANCE_BUTTON_UP,	false },
 			{ 0, JOY_BUTTON_15,	DANCE_BUTTON_DOWN,	false },
+			{ 1, JOY_BUTTON_4,	DANCE_BUTTON_LEFT,	false },
+			{ 1, JOY_BUTTON_2,	DANCE_BUTTON_RIGHT,	false },
+			{ 1, JOY_BUTTON_1,	DANCE_BUTTON_UP,	false },
+			{ 1, JOY_BUTTON_3,	DANCE_BUTTON_DOWN,	false },
+			{ 0, JOY_BUTTON_7,	DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_8,	DANCE_BUTTON_UPRIGHT,	false },
+			{ 0, JOY_BUTTON_9,	DANCE_BUTTON_BACK,	false },
+			{ 0, JOY_BUTTON_10,	DANCE_BUTTON_START,	false },
 			END_MARKER
 		}
 	},