diff --git a/appl/push/push.8 b/appl/push/push.8
index f5f228a8c..abb34c1cd 100644
--- a/appl/push/push.8
+++ b/appl/push/push.8
@@ -17,24 +17,31 @@ fetch mail via POP
 .Oo Fl p Ar port-spec  \*(Ba Xo
 .Fl -port= Ns Ar port-spec Oc
 .Xc
-.Ar hostname Ns Oo : Ns Ar username Oc 
+.Ar po-box
 .Pa filename
 .Sh DESCRIPTION
 .Nm
-retrieves mail for
-.Ar username
-from the post office at 
-.Ar hostname ,
-and stores the mail in mbox format
+retrieves mail from the post office box
+.Ar po-box ,
+and stores the mail in mbox format in
 .Pa filename .
+The
+.Ar po-box
+can have any of the following formats:
+.Bl -hang -compact -offset indent
+.It Ql hostname:username
+.It Ql po:hostname:username
+.It Ql username@hostname
+.It Ql po:username@hostname
+.It Ql hostname
+.It Ql po:username
+.El
+
 If no username is specified,
 .Nm
-assumes that it's the same as on the local machine. If
+assumes that it's the same as on the local machine; 
 .Ar hostname
-is
-.\" Li is parsed, so we need to quote po...
-.Ql \&po ,
-the hostname is taken from the
+defaults to the value of the
 .Ev MAILHOST
 environment variable.
 
@@ -76,8 +83,7 @@ that fails, Kerberos 4.
 
 .Bl -tag -width Ds
 .It Ev MAILHOST
-points to the post office, if the hostname is specified as
-.Ql \&po
+points to the post office, if no other hostname is specified.
 .El
 .\".Sh FILES
 .Sh EXAMPLES