diff --git a/lib/thread.c b/lib/thread.c
index 6ada7cd96a..e4b83eaf86 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -489,8 +489,8 @@ thread_master_create (void)
 #if defined(HAVE_POLL)
   rv->handler.pfdsize = rv->fd_limit;
   rv->handler.pfdcount = 0;
-  rv->handler.pfds = (struct pollfd *) malloc (sizeof (struct pollfd) * rv->handler.pfdsize);
-  memset (rv->handler.pfds, 0, sizeof (struct pollfd) * rv->handler.pfdsize);
+  rv->handler.pfds = (struct pollfd *) XCALLOC (MTYPE_THREAD_MASTER,
+                                                sizeof (struct pollfd) * rv->handler.pfdsize);
 #endif
   return rv;
 }