diff --git a/Android/jni/androidkeys.c b/Android/jni/androidkeys.c
index 0ccebfaf..9c7f88f2 100644
--- a/Android/jni/androidkeys.c
+++ b/Android/jni/androidkeys.c
@@ -40,6 +40,17 @@ void android_keycode_to_emulator(int keyCode, int metaState, bool pressed) {
             break;
         }
 
+        switch (keyCode) {
+            case KEYCODE_BUTTON_A:
+            case KEYCODE_BUTTON_X:
+                joydriver_setButton0Pressed(pressed);
+                return;
+            case KEYCODE_BUTTON_B:
+            case KEYCODE_BUTTON_Y:
+                joydriver_setButton1Pressed(pressed);
+                return;
+        }
+
         switch (keyCode) {
             case KEYCODE_0:
                 key = _is_shifted(metaState) ? ')' : keyCode + ASCII_0_OFFSET;
diff --git a/Android/jni/androidkeys.h b/Android/jni/androidkeys.h
index 5d97710b..c222386a 100644
--- a/Android/jni/androidkeys.h
+++ b/Android/jni/androidkeys.h
@@ -98,6 +98,8 @@
 #define KEYCODE_BUTTON_L2       0x68
 #define KEYCODE_BUTTON_R1       0x67
 #define KEYCODE_BUTTON_R2       0x69
+#define KEYCODE_BUTTON_X        0x63
+#define KEYCODE_BUTTON_Y        0x64
 
 #define META_ALT_LEFT_ON        0x00000010
 #define META_ALT_RIGHT_ON       0x00000020