diff --git a/usr.sbin/yppoll/yppoll.8 b/usr.sbin/yppoll/yppoll.8
index d466fd3d73fd..c08a4e50afbc 100644
--- a/usr.sbin/yppoll/yppoll.8
+++ b/usr.sbin/yppoll/yppoll.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 25, 1994
+.Dd May 31, 2015
 .Dt YPPOLL 8
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nd ask version of YP map from YP server
 .Sh SYNOPSIS
 .Nm
-.Op Fl h Ar host
+.\".Op Fl h Ar host
 .Op Fl d Ar domain
 .Ar mapname
 .Sh DESCRIPTION
@@ -48,15 +48,15 @@ server for
 .Pp
 The options are as follows:
 .Bl -tag -width indent
-.It Fl h Ar host
-Ask the YP server process running on
-.Ar host
-for information about
-.Ar mapname .
-If
-.Ar host
-is not specified, the server polled is the default server returned by
-.Xr ypwhich 1 .
+.\".It Fl h Ar host
+.\"Ask the YP server process running on
+.\".Ar host
+.\"for information about
+.\".Ar mapname .
+.\"If
+.\".Ar host
+.\"is not specified, the server polled is the default server returned by
+.\".Xr ypwhich 1 .
 .It Fl d Ar domain
 Use the YP domain
 .Ar domain
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index e35087c6baaf..34ba18b9f8c0 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -49,7 +49,11 @@ __FBSDID("$FreeBSD$");
 static void
 usage(void)
 {
+#if 0
 	fprintf(stderr, "usage: yppoll [-h host] [-d domainname] mapname\n");
+#else
+	fprintf(stderr, "usage: yppoll [-d domainname] mapname\n");
+#endif
 	exit(1);
 }
 
@@ -57,7 +61,9 @@ int
 main(int argc, char *argv[])
 {
 	char *domainname;
+#if 0
         char *hostname = "localhost";
+#endif
         char *inmap, *master;
         int order;
 	int c, r;
@@ -71,7 +77,11 @@ main(int argc, char *argv[])
                         domainname = optarg;
 			break;
                 case 'h':
+#if 0
                         hostname = optarg;
+#else
+			/* does nothing */
+#endif
                         break;
                 case '?':
                         usage();