diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 118e12343ba5..867bcda9712c 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: domainname.1,v 1.4 1997/02/22 14:03:00 peter Exp $
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
@@ -46,7 +46,7 @@
 prints the name of the current YP/NIS domain.  The super-user can
 set the domain name by supplying an argument; this is usually done in the
 network initialization script
-.Pa /etc/netstart ,
+.Pa /etc/rc.network ,
 normally run at boot
 time.
 .Sh NOTA BENE
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index 1a173e931a02..0dfcb4ba7e1a 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: domainname.c,v 1.8 1997/02/22 14:03:01 peter Exp $
  */
 
 #ifndef lint
@@ -51,14 +51,28 @@ static char const sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #include <string.h>
 #include <unistd.h>
 
+extern char *__progname;
+
+void usage __P((void));
+
 int
 main(argc,argv)
 	int argc;
 	char *argv[];
 {
+	int ch;
 	char domainname[MAXHOSTNAMELEN];
 
-	argc--, argv++;
+	while ((ch = getopt(argc, argv, "")) != -1)
+		switch (ch) {
+		default:
+			usage();
+		}
+	argc -= optind;
+	argv += optind;
+
+	if (argc > 1)
+		usage();
 
 	if (*argv) {
 		if (setdomainname(*argv, strlen(*argv)))
@@ -70,3 +84,10 @@ main(argc,argv)
 	}
 	exit(0);
 }
+
+void
+usage()
+{
+	(void)fprintf(stderr, "usage: %s [ypdomain]\n", __progname);
+	exit(1);
+}