diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index ab0e8c164bcf..ba0b53f78927 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -30,7 +30,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";*/
 /*static char *sccsid = "from: @(#)svc.c	2.4 88/08/11 4.0 RPCSRC";*/
-static char *rcsid = "$Id: svc.c,v 1.7 1996/12/30 15:07:33 peter Exp $";
+static char *rcsid = "$Id: svc.c,v 1.12 1997/05/28 05:05:23 wpaul Exp $";
 #endif
 
 /*
@@ -72,8 +72,8 @@ static struct svc_callout {
 
 static struct svc_callout *svc_find();
 
-int __svc_fdsetsize;
-fd_set *__svc_fdset;
+int __svc_fdsetsize = 0;
+fd_set *__svc_fdset = NULL;
 
 /* ***************  SVCXPRT related stuff **************** */
 
@@ -98,7 +98,7 @@ xprt_register(xprt)
 			free(__svc_fdset);
 		}
 		__svc_fdset = fds;
-		__svc_fdsetsize = howmany(sock+1, NFDBITS);
+		__svc_fdsetsize = howmany(sock+1, NFDBITS) * NFDBITS;
 	}
 
 	if (sock < FD_SETSIZE)