Index: rpcbind-0.2.0/src/rpcbind.c
===================================================================
--- rpcbind-0.2.0.orig/src/rpcbind.c
+++ rpcbind-0.2.0/src/rpcbind.c
@@ -114,7 +114,7 @@ char *tcptrans;		/* Name of TCP transpor
 char *udp_uaddr;	/* Universal UDP address */
 char *tcp_uaddr;	/* Universal TCP address */
 #endif
-static char servname[] = "rpcbind";
+static char servname[] = "sunrpc";
 static char superuser[] = "superuser";
 
 int main __P((int, char *[]));
Index: rpcbind-0.2.0/src/rpcinfo.c
===================================================================
--- rpcbind-0.2.0.orig/src/rpcinfo.c
+++ rpcbind-0.2.0/src/rpcinfo.c
@@ -632,7 +632,7 @@ get_inet_address (addr, host)
 	{
 	  memset (&hints, 0, sizeof hints);
 	  hints.ai_family = AF_INET;
-	  if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 &&
+	  if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 &&
               (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0)
 	    {
 	      fprintf (stderr, "rpcinfo: %s: %s\n",