diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 48e4e305c3b6..51dc57be5515 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -9,8 +9,8 @@ WARNS?=	0
 FILES=	mail.help mail.tildehelp
 FILESDIR=	${SHAREDIR}/misc
 EFILES=	mail.rc
-LINKS=	${BINDIR}/mail ${BINDIR}/Mail
-MLINKS=	mail.1 Mail.1
+LINKS=	${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx
+MLINKS=	mail.1 Mail.1 mail.1 mailx.1
 
 .PATH: ${.CURDIR}/misc
 
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 3fba0b9ff917..24ad0450d5b4 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -37,7 +37,8 @@
 .Os
 .Sh NAME
 .Nm mail ,
-.Nm Mail
+.Nm Mail ,
+.Nm mailx
 .Nd send and receive mail
 .Sh SYNOPSIS
 .Nm
@@ -1162,7 +1163,9 @@ not useful to the general user.
 Usually,
 .Nm
 is just a link to
-.Nm Mail ,
+.Nm Mail
+and
+.Nm mailx ,
 which can be confusing.
 .Pp
 The name of the