diff --git a/os/rt/include/chevents.h b/os/rt/include/chevents.h
index b306dc8af..bb368e96b 100644
--- a/os/rt/include/chevents.h
+++ b/os/rt/include/chevents.h
@@ -102,7 +102,7 @@ typedef void (*evhandler_t)(eventid_t id);
  *          source that is part of a bigger structure.
  * @param name          the name of the event source variable
  */
-#define _EVENTSOURCE_DATA(name) {(void *)(&name)}
+#define _EVENTSOURCE_DATA(name) {(event_listener_t *)(&name)}
 
 /**
  * @brief   Static event source initializer.
diff --git a/readme.txt b/readme.txt
index f34d5b2a6..b596b054f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -111,6 +111,8 @@
        17.6.1 and 16.1.9).
 - RT:  Fixed misplaced assertion in semaphores code (bug #865)(backported to
        17.6.1 and 16.1.9).
+- RT:  Fixed event cast cleanup for compilation warnings (bug #864)(backported
+       to 17.6.1 and 16.1.9).
 - HAL: Fixed STM32 USBv1 fails the state check when USB_USE_WAIT is TRUE
        (bug #863)(backported to 17.6.1 and 16.1.9).
 - HAL: Fixed incorrect OTG stepping in STM32F412 registry (bug #861)