diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index d72c8fea11..20fd8f5730 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -207,10 +207,11 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 			END_MARKER
 		}
 	},
-	{
+/*	{
 		"dance",
 		"MP-8866 Dual USB Joypad",
-		"Super Dual Box",
+		"Super Dual Box (from Lik-Sang, 2004)",
+		//NEEDS_DANCE_PAD_MAPPING_CODE,
 		{
 			{ 0, JOY_LEFT,		DANCE_BUTTON_LEFT,	false },
 			{ 0, JOY_RIGHT,		DANCE_BUTTON_RIGHT,	false },
@@ -229,6 +230,26 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 			END_MARKER
 		}
 	},
+*/
+	{
+		"dance",
+		"MP-8866 Dual USB Joypad",
+		"Super Dual Box (from DDRGame.com, Feb 2008)",
+		//NEEDS_DANCE_PAD_MAPPING_CODE,
+		{
+			{ 0, JOY_3,	DANCE_BUTTON_UP,	false },
+			{ 0, JOY_2,	DANCE_BUTTON_DOWN,	false },
+			{ 0, JOY_1,	DANCE_BUTTON_LEFT,	false },
+			{ 0, JOY_4,	DANCE_BUTTON_RIGHT,	false },
+			{ 0, JOY_7,	DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_8,	DANCE_BUTTON_UPRIGHT,	false },
+			//{ 0, JOY_5,	DANCE_BUTTON_DOWNLEFT,	false },
+			//{ 0, JOY_6,	DANCE_BUTTON_DOWNRIGHT,	false },
+			{ 0, JOY_10,	DANCE_BUTTON_BACK,	false },
+			{ 0, JOY_9,	DANCE_BUTTON_START,	false },
+			END_MARKER
+		}
+	},
 	{
 		"dance",
 		"NTPAD",
@@ -424,6 +445,42 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 			END_MARKER
 		}
 	},
+	{
+		"dance",
+		"USB Dance Pad",
+		"DDRGame Energy Dance Pad",
+		{
+			{ 0, JOY_13,	DANCE_BUTTON_UP,	false },
+			{ 0, JOY_15,	DANCE_BUTTON_DOWN,	false },
+			{ 0, JOY_16,	DANCE_BUTTON_LEFT,	false },
+			{ 0, JOY_14,	DANCE_BUTTON_RIGHT,	false },
+			{ 0, JOY_3,	DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_2,	DANCE_BUTTON_UPRIGHT,	false },
+			//{ 0, JOY_1,	DANCE_BUTTON_DOWNLEFT,	false },
+			//{ 0, JOY_4,	DANCE_BUTTON_DOWNRIGHT,	false },
+			{ 0, JOY_9,	DANCE_BUTTON_BACK,	false },
+			{ 0, JOY_10,	DANCE_BUTTON_START,	false },
+			END_MARKER
+		}
+	},
+	{
+		"dance",
+		"Dual USB Vibration Joystick",
+		"PC Multi Hub Double Power Box 4",
+		{
+			{ 0, JOY_13,	DANCE_BUTTON_UP,	false },
+			{ 0, JOY_15,	DANCE_BUTTON_DOWN,	false },
+			{ 0, JOY_16,	DANCE_BUTTON_LEFT,	false },
+			{ 0, JOY_14,	DANCE_BUTTON_RIGHT,	false },
+			{ 0, JOY_3,	DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_2,	DANCE_BUTTON_UPRIGHT,	false },
+			//{ 0, JOY_1,	DANCE_BUTTON_DOWNLEFT,	false },
+			//{ 0, JOY_4,	DANCE_BUTTON_DOWNRIGHT,	false },
+			{ 0, JOY_9,	DANCE_BUTTON_BACK,	false },
+			{ 0, JOY_10,	DANCE_BUTTON_START,	false },
+			END_MARKER
+		}
+	},
 	{
 		"pump",
 		"Pump USB",