diff --git a/input/android_input.c b/input/android_input.c
index 381f7c0185..0746204ca3 100644
--- a/input/android_input.c
+++ b/input/android_input.c
@@ -486,7 +486,10 @@ static void handle_hotplug(void *data, unsigned port, unsigned id,
    else if (strstr(name_buf, "Zeemote") && strstr(name_buf, "Steelseries free"))
       device = DEVICE_ZEEMOTE_STEELSERIES;
    else if (strstr(name_buf, "HuiJia  USB GamePad"))
+   {
       device = DEVICE_HUIJIA_USB_SNES;
+      strlcpy(name_buf, "HuiJia", sizeof(name_buf));
+   }
    else if (strstr(name_buf, "Smartjoy Family Super Smartjoy 2"))
       device = DEVICE_SUPER_SMARTJOY;
    else if (strstr(name_buf, "Jess Tech Dual Analog Rumble Pad"))
diff --git a/input/autoconf/builtin_android.c b/input/autoconf/builtin_android.c
index 5b4a01a579..872e94c5b1 100644
--- a/input/autoconf/builtin_android.c
+++ b/input/autoconf/builtin_android.c
@@ -93,6 +93,21 @@ DECL_AXIS(r_x_minus, -2) \
 DECL_AXIS(r_y_plus, +3) \
 DECL_AXIS(r_y_minus, -3)
 
+#define HUIJIA_DEFAULT_BINDS \
+DECL_BTN(a, 189) \
+DECL_BTN(b, 190) \
+DECL_BTN(x, 188) \
+DECL_BTN(y, 191) \
+DECL_BTN(start, 197) \
+DECL_BTN(select, 196) \
+DECL_AXIS(up, -1) \
+DECL_AXIS(down, +1) \
+DECL_AXIS(left, -0) \
+DECL_AXIS(right, +0) \
+DECL_BTN(l, 194) \
+DECL_BTN(r, 195)
+
+
 #define RUMBLEPAD2_DEFAULT_BINDS \
 DECL_BTN(a, 190) \
 DECL_BTN(b, 189) \
@@ -138,5 +153,9 @@ const char* const input_builtin_autoconfs[] =
    "input_driver = \"android\"                    \n"
    SIXAXIS_DEFAULT_BINDS,
 
+   "input_device = \"HuiJia\" \n"
+   "input_driver = \"android\"                    \n"
+   HUIJIA_DEFAULT_BINDS,
+
    NULL
 };