diff --git a/src/input/evdev.c b/src/input/evdev.c
index 74055ac..3d9b753 100644
--- a/src/input/evdev.c
+++ b/src/input/evdev.c
@@ -246,6 +246,12 @@ static bool evdev_handle_event(struct input_event *ev, struct input_device *dev)
       case BTN_RIGHT:
         mouseCode = BUTTON_RIGHT;
         break;
+      case BTN_SIDE:
+        mouseCode = BUTTON_X1;
+        break;
+      case BTN_EXTRA:
+        mouseCode = BUTTON_X2;
+        break;
       default:
         gamepadModified = true;
         if (dev->map == NULL)
diff --git a/src/input/sdl.c b/src/input/sdl.c
index f2787f9..0438d7a 100644
--- a/src/input/sdl.c
+++ b/src/input/sdl.c
@@ -96,6 +96,12 @@ int sdlinput_handle_event(SDL_Event* event) {
     case SDL_BUTTON_RIGHT:
       button = BUTTON_RIGHT;
       break;
+    case SDL_BUTTON_X1:
+      button = BUTTON_X1;
+      break;
+    case SDL_BUTTON_X2:
+      button = BUTTON_X2;
+      break;
     }
 
     if (button != 0)
diff --git a/src/input/x11.c b/src/input/x11.c
index 0186613..df35f65 100644
--- a/src/input/x11.c
+++ b/src/input/x11.c
@@ -110,6 +110,12 @@ static int x11_handler(int fd) {
       case Button5:
         LiSendScrollEvent(-1);
         break;
+      case 8:
+        button = BUTTON_X1;
+        break;
+      case 9:
+        button = BUTTON_X2;
+        break;
       }
 
       if (button != 0)
diff --git a/third_party/moonlight-common-c b/third_party/moonlight-common-c
index 2f64101..6bb60b1 160000
--- a/third_party/moonlight-common-c
+++ b/third_party/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 2f641016ce222cc754dceb329b91a77352940370
+Subproject commit 6bb60b19775bae2097855bd5d67aed2d7e023dfe