diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c
index f824af32..7c6fcffa 100644
--- a/src/input/mpegts/iptv/iptv.c
+++ b/src/input/mpegts/iptv/iptv.c
@@ -312,8 +312,8 @@ iptv_input_start_mux ( mpegts_input_t *mi, mpegts_mux_instance_t *mmi )
     if (fd != -1) {
       tvhpoll_event_t ev;
       memset(&ev, 0, sizeof(ev));
-      ev.events = TVHPOLL_IN;
-      ev.fd     = im->mm_iptv_fd = fd;
+      ev.events          = TVHPOLL_IN;
+      ev.fd = ev.data.fd = im->mm_iptv_fd = fd;
       if (tvhpoll_add(iptv_poll, &ev, 1) == -1) {
         tvherror("iptv", "%s - failed to add to poll q", buf);
         close(fd);
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index a2e1fb01..22de3b18 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -613,10 +613,10 @@ linuxdvb_frontend_input_thread ( void *aux )
   /* Setup poll */
   efd = tvhpoll_create(2);
   memset(ev, 0, sizeof(ev));
-  ev[0].events  = TVHPOLL_IN;
-  ev[0].fd      = dvr;
-  ev[1].events  = TVHPOLL_IN;
-  ev[1].fd      = lfe->lfe_dvr_pipe.rd;
+  ev[0].events             = TVHPOLL_IN;
+  ev[0].fd = ev[0].data.fd = dvr;
+  ev[1].events             = TVHPOLL_IN;
+  ev[1].fd = ev[1].data.fd = lfe->lfe_dvr_pipe.rd;
   tvhpoll_add(efd, ev, 2);
 
   /* Read */
diff --git a/src/input/mpegts/tsfile/tsfile_input.c b/src/input/mpegts/tsfile/tsfile_input.c
index b956d586..c7ae08d1 100644
--- a/src/input/mpegts/tsfile/tsfile_input.c
+++ b/src/input/mpegts/tsfile/tsfile_input.c
@@ -67,8 +67,8 @@ tsfile_input_thread ( void *aux )
   /* Polling */
   memset(&ev, 0, sizeof(ev));
   efd = tvhpoll_create(2);
-  ev.events = TVHPOLL_IN;
-  ev.fd     = mi->mi_thread_pipe.rd;
+  ev.events          = TVHPOLL_IN;
+  ev.fd = ev.data.fd = mi->mi_thread_pipe.rd;
   tvhpoll_add(efd, &ev, 1);
 
   /* Get file length */