diff --git a/ChangeLog b/ChangeLog
index bb59fa585e..d22d2e5dbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-29  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst/gstpoll.c: (gst_poll_fd_init):
+	* gst/gstpoll.h:
+	Added Since tags.
+
+	* plugins/elements/gstfdsink.c: (gst_fd_sink_update_fd):
+	Use some more init macros.
+
 2008-02-29  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* plugins/elements/gstfdsink.c: (gst_fd_sink_start):
diff --git a/gst/gstpoll.c b/gst/gstpoll.c
index 27dd44d024..0567086b9c 100644
--- a/gst/gstpoll.c
+++ b/gst/gstpoll.c
@@ -371,6 +371,8 @@ gst_poll_get_mode (const GstPoll * set)
  *
  * Initializes @fd. Alternatively you can initialize it with
  * #GST_POLL_FD_INIT.
+ *
+ * Since: 0.10.18
  */
 void
 gst_poll_fd_init (GstPollFD * fd)
diff --git a/gst/gstpoll.h b/gst/gstpoll.h
index 3a9e135f26..ea604eb23f 100644
--- a/gst/gstpoll.h
+++ b/gst/gstpoll.h
@@ -58,8 +58,10 @@ typedef struct {
  * used. This macro can used be to initialize a variable, but it cannot
  * be assigned to a variable. In that case you have to use
  * gst_poll_fd_init().
+ *
+ * Since: 0.10.18
  */
-#define GST_POLL_FD_INIT { -1, -1 }
+#define GST_POLL_FD_INIT  { -1, -1 }
 
 /**
  * GstPollMode:
diff --git a/plugins/elements/gstfdsink.c b/plugins/elements/gstfdsink.c
index 6d3c93a146..32b7fc746e 100644
--- a/plugins/elements/gstfdsink.c
+++ b/plugins/elements/gstfdsink.c
@@ -424,13 +424,13 @@ gst_fd_sink_update_fd (GstFdSink * fdsink, int new_fd)
   /* assign the fd */
   GST_OBJECT_LOCK (fdsink);
   if (fdsink->fdset) {
-    GstPollFD fd = { 0 };
+    GstPollFD fd = GST_POLL_FD_INIT;
 
     fd.fd = fdsink->fd;
     gst_poll_remove_fd (fdsink->fdset, &fd);
 
     /* Reset the GstPollFD */
-    memset (&fd, 0, sizeof (GstPollFD));
+    gst_poll_fd_init (&fd);
 
     fd.fd = new_fd;
     gst_poll_add_fd (fdsink->fdset, &fd);