diff --git a/ChangeLog b/ChangeLog
index 151b7f6413..fd7ddf4549 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+1999-08-11  Thorsten Kukuk  <kukuk@suse.de>
+
+	* nis/nis_callback.c (internal_nis_do_callback): Free my_pollfd.
+
 1999-08-13  Ulrich Drepper  <drepper@cygnus.com>
 
-	* stdio-common/vfscanf.c: Don't recognize hexadecimal floats with
+	* stdio-common/vfscanf.c: Don't recognize hexadecimal floats without
 	exponent.
 
 1999-08-10  Andreas Schwab  <schwab@suse.de>
diff --git a/nis/nis_callback.c b/nis/nis_callback.c
index cf96b42dcf..904e927055 100644
--- a/nis/nis_callback.c
+++ b/nis/nis_callback.c
@@ -220,10 +220,12 @@ internal_nis_do_callback (struct dir_binding *bptr, netobj *cookie,
       switch (i = __poll (my_pollfd, svc_max_pollfd, 25*1000))
         {
 	case -1:
+	  free (my_pollfd);
 	  if (errno == EINTR)
 	    continue;
 	  return NIS_CBERROR;
 	case 0:
+	  free (my_pollfd);
 	  /* See if callback 'thread' in the server is still alive. */
 	  memset ((char *) &cb_is_running, 0, sizeof (cb_is_running));
 	  if (clnt_call (bptr->clnt, NIS_CALLBACK, (xdrproc_t) xdr_netobj,
@@ -239,6 +241,7 @@ internal_nis_do_callback (struct dir_binding *bptr, netobj *cookie,
 	  break;
 	default:
 	  svc_getreq_poll (my_pollfd, i);
+	  free (my_pollfd);
 	  if (data->nomore)
 	    return data->result;
 	}