diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile
index fe40864ba575..782daa73c1b2 100644
--- a/usr.sbin/ypset/Makefile
+++ b/usr.sbin/ypset/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.8 1997/07/18 08:16:57 thorpej Exp $
+#	$NetBSD: Makefile,v 1.9 1997/10/06 00:33:18 lukem Exp $
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
 
 PROG=	ypset
 MAN=	ypset.8
-WARNS=1
+WARNS?=1
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ypset/ypset.8 b/usr.sbin/ypset/ypset.8
index 0657aa95aef4..28570ef51e88 100644
--- a/usr.sbin/ypset/ypset.8
+++ b/usr.sbin/ypset/ypset.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ypset.8,v 1.3 1997/07/30 22:55:34 jtc Exp $
+.\"	$NetBSD: ypset.8,v 1.4 1997/10/06 00:33:20 lukem Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -43,12 +43,12 @@
 .Xr ypbind 8
 which YP server process to use
 .Sh SYNOPSIS
-.Nm ypset
+.Nm
 .Op Fl h Ar host
 .Op Fl d Ar domain
 .Ar server
 .Sh DESCRIPTION
-.Nm Ypset
+.Nm
 tells the
 .Xr ypbind 8
 process on the current machine which YP server process to communicate with.
@@ -59,7 +59,7 @@ a YP client process attempts to access a YP map, at which time
 .Xr ypbind 8
 tests the binding and takes appropriate action.
 .Pp
-.Nm Ypset
+.Nm
 is most useful for binding a YP client that is not on the same broadcast
 network as the closest YP server, but can also be used for debugging
 a local network's YP configuration, testing specific YP client
@@ -80,11 +80,11 @@ instead of the default domain as returned by
 .El
 .Sh SEE ALSO
 .Xr domainname 1 ,
-.Xr ypbind 8 ,
 .Xr ypcat 1 ,
 .Xr ypmatch 1 ,
-.Xr yppoll 8 ,
 .Xr ypwhich 1 ,
-.Xr yp 8
+.Xr yp 8 ,
+.Xr ypbind 8 ,
+.Xr yppoll 8
 .Sh AUTHOR
-Theo De Raadt
+Theo de Raadt