diff --git a/input/input_defines.h b/input/input_defines.h
index 5e4103bcc9..fa9a868634 100644
--- a/input/input_defines.h
+++ b/input/input_defines.h
@@ -28,7 +28,7 @@ RETRO_BEGIN_DECLS
 
 #define MAX_INPUT_DEVICES              16
 
-#define RARCH_MAX_KEYS 136
+#define RARCH_MAX_KEYS 137
 
 #define RARCH_FIRST_CUSTOM_BIND        16
 #define RARCH_FIRST_LIGHTGUN_BIND      RARCH_ANALOG_BIND_LIST_END
diff --git a/input/input_keymaps.c b/input/input_keymaps.c
index 8060d92b80..ff3817ad92 100644
--- a/input/input_keymaps.c
+++ b/input/input_keymaps.c
@@ -288,6 +288,7 @@ const struct input_key_map input_config_key_map[] = {
    { "euro", RETROK_EURO },
    { "undo", RETROK_UNDO },
    { "clear", RETROK_CLEAR },
+   { "oem102", RETROK_OEM_102 },
 
    { "nul", RETROK_UNKNOWN },
    { NULL, RETROK_UNKNOWN },
@@ -328,7 +329,7 @@ const struct rarch_key_map rarch_key_map_sdl[] = {
    { SDLK_9, RETROK_9 },
    { SDLK_COLON, RETROK_COLON },
    { SDLK_SEMICOLON, RETROK_SEMICOLON },
-   { SDLK_LESS, RETROK_LESS },
+   { SDLK_LESS, RETROK_OEM_102 },
    { SDLK_EQUALS, RETROK_EQUALS },
    { SDLK_GREATER, RETROK_GREATER },
    { SDLK_QUESTION, RETROK_QUESTION },
@@ -574,6 +575,7 @@ const struct rarch_key_map rarch_key_map_dinput[] = {
    { DIK_SCROLL, RETROK_SCROLLOCK },
    { DIK_CAPSLOCK, RETROK_CAPSLOCK },
    { DIK_NUMLOCK, RETROK_NUMLOCK },
+   { DIK_OEM_102, RETROK_OEM_102 },
    { 0, RETROK_UNKNOWN },
 };
 #endif
@@ -831,6 +833,7 @@ const struct rarch_key_map rarch_key_map_x11[] = {
    /*{ ?, RETROK_POWER },*/
    { XK_EuroSign, RETROK_EURO },
    { XK_Undo, RETROK_UNDO },
+   /*{ ?, RETROK_OEM_102 },*/
    /* FIXME(shizeeg): RetroArch can't handle these buttons atm.
     * Do we really need RETROK_KP_INSERT, RETROK_KP_END,
     * RETROK_KP_DOWN, RETROK_KP_PAGEDOWN ???
@@ -986,6 +989,7 @@ const struct rarch_key_map rarch_key_map_linux[] = {
    { KEY_EURO, RETROK_EURO },
 #endif
    { KEY_UNDO, RETROK_UNDO },
+   /*{ ?, RETROK_OEM_102 },*/
    { 0, RETROK_UNKNOWN },
 };
 #endif
@@ -1320,6 +1324,7 @@ const struct rarch_key_map rarch_key_map_apple_hid[] = {
    /* { ?, RETROK_POWER }, */
    /* { ?, RETROK_EURO }, */
    /* { ?, RETROK_UNDO }, */
+   { KEY_NonUSBackslash, RETROK_OEM_102 },
    { 0, RETROK_UNKNOWN }
 };
 #endif
diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index 86e1652e57..826283b3fa 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -450,6 +450,7 @@ enum retro_key
    RETROK_POWER          = 320,
    RETROK_EURO           = 321,
    RETROK_UNDO           = 322,
+   RETROK_OEM_102        = 323,
 
    RETROK_LAST,
 
diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c
index 33d4b5a01e..002e5039fe 100644
--- a/menu/menu_cbs.c
+++ b/menu/menu_cbs.c
@@ -174,7 +174,8 @@ struct key_desc key_descriptors[RARCH_MAX_KEYS] =
    {RETROK_MENU,           "Menu"},
    {RETROK_POWER,          "Power"},
    {RETROK_EURO,           "€"},
-   {RETROK_UNDO,           "Undo"}
+   {RETROK_UNDO,           "Undo"},
+   {RETROK_OEM_102,        "OEM-102"}
 };
 
 /* This sets up all the callback functions for a menu entry.