2 files changed, 10 insertions, 12 deletions

diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 79457b4f23b9..f81622260f6c 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -49,13 +49,10 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl Tfknst
-.Op Fl M Ar core
-.Op Fl N Ar system
-.Pp
+.Op Fl M Ar core Op Fl N Ar system
 .Nm swapinfo
 .Op Fl k
-.Op Fl M Ar core
-.Op Fl N Ar system
+.Op Fl M Ar core Op Fl N Ar system
 .Sh DESCRIPTION
 The
 .Nm
@@ -70,11 +67,9 @@ option is implied, and only the
 .Fl k
 option is legal.
 .Pp
-If neither the
-.Fl N
-nor the
+If the
 .Fl M
-option is specified, information is obtained from
+option is not specified, information is obtained from
 the currently running kernel via the
 .Xr sysctl 3
 interface.
@@ -244,7 +239,10 @@ PPPDISC.
 .It Fl M
 Extract values associated with the name list from the specified core.
 .It Fl N
-Extract the name list from the specified system instead of the default,
+If
+.Fl M
+is also specified,
+extract the name list from the specified system instead of the default,
 which is the kernel image the system has booted from.
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index d93e76c14061..7fecfd7b421d 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -124,10 +124,10 @@ main(int argc, char *argv[])
 	if (!strcmp(opts, "swapinfo")) {
 		swapflag = 1;
 		opts = "kM:N:";
-		usagestr = "swapinfo [-k] [-M core] [-N system]";
+		usagestr = "swapinfo [-k] [-M core [-N system]]";
 	} else {
 		opts = "TM:N:fknst";
-		usagestr = "pstat [-Tfknst] [-M core] [-N system]";
+		usagestr = "pstat [-Tfknst] [-M core [-N system]]";
 	}
 
 	while ((ch = getopt(argc, argv, opts)) != -1)