diff --git a/ChangeLog b/ChangeLog
index a3a7478..8592c10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1983,3 +1983,13 @@ people have e > 0.16.4, the old behaviour is the default. Please ./configure
 seconds ago) It should be much streamlined. Especially for you guys on
 interesting hardware =)
 
+-------------------------------------------------------------------------------
+
+Mon Feb 28 12:14:11 GMT 2000
+(gilbertt)
+
+Fixed Epplet_register_event_handler, prompted by email from Alexandre David
+<adavid@DoCS.UU.SE>. His patch was incorrect though, and the proper fix is
+to change the line where the event handler is called. (His patch changed
+only one definition of it, in the wrong place, and broke epplets ;)
+
diff --git a/api/epplet.c b/api/epplet.c
index 4db6bd5..997deb7 100644
--- a/api/epplet.c
+++ b/api/epplet.c
@@ -1256,7 +1256,7 @@ Epplet_handle_event(XEvent * ev)
    Epplet_gadget       g = NULL;
 
    if (event_func)
-      (*event_func) (ev, event_data);
+      (*event_func) (event_data, ev);
    switch (ev->type)
      {
      case ClientMessage: