diff --git a/sc2/src/sc2code/libs/input/sdl/input.c b/sc2/src/sc2code/libs/input/sdl/input.c
index 6658dfee0..d2bc70613 100644
--- a/sc2/src/sc2code/libs/input/sdl/input.c
+++ b/sc2/src/sc2code/libs/input/sdl/input.c
@@ -388,9 +388,13 @@ InterrogateInputState (int template, int control, int index, char *buffer, int m
 			buffer[maxlen-1] = 0;
 			break;
 		case VCONTROL_JOYBUTTON:
-			snprintf (buffer, maxlen, "[Button %d]", g.gesture.button.index + 1);
+			snprintf (buffer, maxlen, "[J%d B%d]", g.gesture.button.port, g.gesture.button.index + 1);
 			buffer[maxlen-1] = 0;
 			break;
+		case VCONTROL_JOYAXIS:
+			snprintf (buffer, maxlen, "[J%d A%d %c]", g.gesture.axis.port, g.gesture.axis.index, g.gesture.axis.polarity > 0 ? '+' : '-');
+		case VCONTROL_JOYHAT:
+			snprintf (buffer, maxlen, "[J%d H%d %d]", g.gesture.hat.port, g.gesture.hat.index, g.gesture.hat.dir);
 		default:
 			/* Something we don't handle yet */
 			buffer[0] = 0;