diff --git a/src/xpra/x11/uinput_device.py b/src/xpra/x11/uinput_device.py
index 670096bb52..c4deaca2c9 100644
--- a/src/xpra/x11/uinput_device.py
+++ b/src/xpra/x11/uinput_device.py
@@ -5,8 +5,9 @@
 # later version. See the file COPYING for details.
 
 from uinput import (
-    BTN_LEFT, BTN_RIGHT, BTN_MIDDLE, BTN_SIDE, BTN_EXTRA, REL_WHEEL,    #@UnresolvedImport
-    REL_X, REL_Y, BTN_TOUCH, ABS_X, ABS_Y, ABS_PRESSURE,                #@UnresolvedImport
+    BTN_LEFT, BTN_RIGHT, BTN_MIDDLE, BTN_SIDE, BTN_EXTRA,
+    REL_WHEEL, REL_HWHEEL,
+    REL_X, REL_Y, BTN_TOUCH, ABS_X, ABS_Y, ABS_PRESSURE,
     )
 
 from xpra.util import envint
@@ -28,6 +29,7 @@
     BTN_SIDE     : "BTN_SIDE",
     BTN_EXTRA    : "BTN_EXTRA",
     REL_WHEEL    : "REL_WHEEL",
+    REL_HWHEEL   : "REL_HWHEEL",
     }
 BUTTON_MAP = {
     1   : BTN_LEFT,
@@ -73,6 +75,16 @@ def click(self, button, pressed, *_args):
             val = -1*mult
             if pressed: #only send one event
                 return
+        elif button==6:
+            ubutton = REL_HWHEEL
+            val = 1*mult
+            if pressed: #only send one event
+                return
+        elif button==7:
+            ubutton = REL_HWHEEL
+            val = -1*mult
+            if pressed: #only send one event
+                return
         else:
             ubutton = BUTTON_MAP.get(button)
             val = bool(pressed)
@@ -86,13 +98,17 @@ def click(self, button, pressed, *_args):
     def wheel_motion(self, button, distance):
         if button in (4, 5):
             val = distance*MOUSE_WHEEL_CLICK_MULTIPLIER
+            ubutton = REL_WHEEL
+        elif button in (6, 7):
+            val = distance*MOUSE_WHEEL_CLICK_MULTIPLIER
+            ubutton = REL_HWHEEL
         else:
             log.warn("Warning: %s", self)
             log.warn(" cannot handle wheel motion %i", button)
             log.warn(" this event has been dropped")
             return
         delta = self.wheel_delta+val
-        log("UInput.wheel_motion(%i, %.4f) REL_WHEEL: %s+%s=%s", button, distance, self.wheel_delta, val, delta)
+        log("UInput.wheel_motion(%i, %.4f) %s: %s+%s=%s", button, distance, BUTTON_STR.get(ubutton), self.wheel_delta, val, delta)
         ival = int(delta)
         if ival!=0:
             self.device.emit(REL_WHEEL, ival)