diff --git a/contrib/top/top.X b/contrib/top/top.X
index acddde8acec..830e50dd234 100644
--- a/contrib/top/top.X
+++ b/contrib/top/top.X
@@ -10,7 +10,7 @@ top \- display and update information about the top cpu processes
 .SH SYNOPSIS
 .B top
 [
-.B \-abCHIijnqStuv
+.B \-abCHIijnPqStuv
 ] [
 .BI \-d count
 ] [
@@ -119,6 +119,9 @@ Display either 'cpu' or 'io' statistics.  Default is 'cpu'.
 Use \*(lqnon-interactive\*(rq mode.  This is identical to \*(lqbatch\*(rq
 mode.
 .TP
+.B \-P
+Display per-cpu CPU usage statistics.
+.TP
 .B \-q
 Renice
 .I top
diff --git a/contrib/top/top.c b/contrib/top/top.c
index 3fbd3a2992e..762efaa2a72 100644
--- a/contrib/top/top.c
+++ b/contrib/top/top.c
@@ -283,7 +283,7 @@ char *argv[];
 	    optind = 1;
 	}
 
-	while ((i = getopt(ac, av, "CSIHPabijnpquvs:d:U:m:o:t")) != EOF)
+	while ((i = getopt(ac, av, "CSIHPabijnquvs:d:U:m:o:t")) != EOF)
 	{
 	    switch(i)
 	    {
@@ -412,14 +412,10 @@ char *argv[];
 		pcpu_stats = Yes;
 		break;
 
-	      case 'p':
-		pcpu_stats = No;
-		break;
-
 	      default:
 		fprintf(stderr,
 "Top version %s\n"
-"Usage: %s [-abCHIijnqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n"
+"Usage: %s [-abCHIijnPqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n"
 "       [-U username] [number]\n",
 			version_string(), myname);
 		exit(1);