diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index 024f2e833..6ddcf9e8b 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -605,6 +605,7 @@ eventToDeviceEvent(DeviceEvent *ev, xEvent **xi)
     xde->root_x         = FP1616(ev->root_x, ev->root_x_frac);
     xde->root_y         = FP1616(ev->root_y, ev->root_y_frac);
 
+    xde->flags          = ev->flags;
     if (ev->key_repeat)
         xde->flags      |= XIKeyRepeat;
 
diff --git a/include/eventstr.h b/include/eventstr.h
index 049688ca0..0885883a5 100644
--- a/include/eventstr.h
+++ b/include/eventstr.h
@@ -113,6 +113,7 @@ struct _DeviceEvent
     Window      root; /**< Root window of the event */
     int corestate;    /**< Core key/button state BEFORE the event */
     int key_repeat;   /**< Internally-generated key repeat event */
+    uint32_t flags;   /**< Flags to be copied into the generated event */
 };