2 files changed, 28 insertions, 15 deletions

diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index dfd1d5972673..9a8b9918dffe 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -3,7 +3,10 @@
 
 PROG=	uuencode
 MAN=	uuencode.1 uuencode.format.5
+LINKS=	${BINDIR}/uuencode ${BINDIR}/b64encode
 MLINKS=	uuencode.1 uudecode.1 \
-	uuencode.format.5 uuencode.5
+	uuencode.format.5 uuencode.5 \
+	uuencode.1 b64encode.1 \
+	b64encode.1 b64decode.1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 3867d22d9f74..0fe44cdd0a57 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -37,7 +37,9 @@
 .Os
 .Sh NAME
 .Nm uuencode ,
-.Nm uudecode
+.Nm uudecode ,
+.Nm b64encode ,
+.Nm b64decode
 .Nd encode/decode a binary file
 .Sh SYNOPSIS
 .Nm
@@ -51,6 +53,16 @@
 .Nm uudecode
 .Op Fl i
 .Fl o Ar output_file
+.Nm b64encode
+.Op Fl o Ar output_file
+.Op Ar file
+.Ar name
+.Nm b64decode
+.Op Fl cips
+.Op Ar
+.Nm b64decode
+.Op Fl i
+.Fl o Ar output_file
 .Op Ar file
 .Sh DESCRIPTION
 The
@@ -61,6 +73,17 @@ utilities are used to transmit binary files over transmission mediums
 that do not support other than simple
 .Tn ASCII
 data.
+The
+.Nm b64encode
+utility is synonymous with
+.Nm
+with the
+.Fl m
+flag specified.
+The
+.Nm b64decode
+utility is synonymous with
+.Nm uudecode .
 .Pp
 The
 .Nm
@@ -108,19 +131,6 @@ instead of standard output.
 .El
 .Pp
 The following options are available for
-.Nm :
-.Bl -tag -width ident
-.It Fl m
-Use the Base64 method of encoding, rather than the traditional
-.Nm
-algorithm.
-.It Fl o Ar output_file
-Output to
-.Ar output_file
-instead of standard output.
-.El
-.Pp
-The following options are available for
 .Nm uudecode :
 .Bl -tag -width ident
 .It Fl c